Merge "Load module mediawiki.page.gallery.styles for all ImageGalleries"

diff --combined includes/parser/Parser.php
index 12bb175,c07a08a..3e5e8a1
--- 1/includes/parser/Parser.php
--- 2/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@@ -1474,9 -1474,8 +1474,9 @@@ class Parser 
                # The characters '<' and '>' (which were escaped by
                # removeHTMLtags()) should not be included in
                # URLs, per RFC 2396.
 +              # Make &nbsp; terminate a URL as well (bug T84937)
                $m2 = array();
 -              if ( preg_match( '/&(lt|gt);/', $url, $m2, PREG_OFFSET_CAPTURE ) ) {
 +              if ( preg_match( '/&(lt|gt|nbsp|#x0*(3[CcEe]|[Aa]0)|#0*(60|62|160));/', $url, $m2, PREG_OFFSET_CAPTURE ) ) {
                        $trail = substr( $url, $m2[0][1] ) . $trail;
                        $url = substr( $url, 0, $m2[0][1] );
                }
@@@ -4843,7 -4842,16 +4843,7 @@@
                $ts = $this->mOptions->getTimestamp();
                $timestamp = MWTimestamp::getLocalInstance( $ts );
                $ts = $timestamp->format( 'YmdHis' );
 -              $tzMsg = $timestamp->format( 'T' );  # might vary on DST changeover!
 -
 -              # Allow translation of timezones through wiki. format() can return
 -              # whatever crap the system uses, localised or not, so we cannot
 -              # ship premade translations.
 -              $key = 'timezone-' . strtolower( trim( $tzMsg ) );
 -              $msg = wfMessage( $key )->inContentLanguage();
 -              if ( $msg->exists() ) {
 -                      $tzMsg = $msg->text();
 -              }
 +              $tzMsg = $timestamp->getTimezoneMessage()->inContentLanguage()->text();
  
                $d = $wgContLang->timeanddate( $ts, false, false ) . " ($tzMsg)";
  
@@@ -5318,7 -5326,6 +5318,6 @@@
                $ig->setParser( $this );
                $ig->setHideBadImages();
                $ig->setAttributes( Sanitizer::validateTagAttributes( $params, 'table' ) );
-               $this->getOutput()->addModuleStyles( 'mediawiki.page.gallery.styles' );
  
                if ( isset( $params['showfilename'] ) ) {
                        $ig->setShowFilename( true );