Add <!DOCTYPE html> to HTML responses

[lhc/web/wiklou.git] / includes / OutputPage.php
diff --git a/includes/OutputPage.php b/includes/OutputPage.php

index d9230b0..2933681 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -67,13 +67,6 @@ class OutputPage extends ContextSource {
          */
         public $mBodytext = '';
  
-       /**
-        * Holds the debug lines that will be output as comments in page source if
-        * $wgDebugComments is enabled. See also $wgShowDebug.
-        * @deprecated since 1.20; use MWDebug class instead.
-        */
-       public $mDebugtext = '';
-
         /** @var string Stores contents of "<title>" tag */
         private $mHTMLtitle = '';
  
@@ -2251,7 +2244,7 @@ class OutputPage extends ContextSource {
                                 $response->header( "Content-Type: text/html; charset=utf-8" );
                                 if ( $config->get( 'DebugRedirects' ) ) {
                                         $url = htmlspecialchars( $redirect );
-                                       print "<html>\n<head>\n<title>Redirect</title>\n</head>\n<body>\n";
+                                       print "<!DOCTYPE html>\n<html>\n<head>\n<title>Redirect</title>\n</head>\n<body>\n";
                                         print "<p>Location: <a href=\"$url\">$url</a></p>\n";
                                         print "</body>\n</html>\n";
                                 } else {
@@ -2268,7 +2261,7 @@ class OutputPage extends ContextSource {
                 ob_start();
  
                 $response->header( 'Content-type: ' . $config->get( 'MimeType' ) . '; charset=UTF-8' );
-               $response->header( 'Content-language: ' . $config->get( 'LanguageCode' ) );
+               $response->header( 'Content-language: ' . $config->get( 'ContLang' )->getHtmlCode() );
  
                 // Avoid Internet Explorer "compatibility view" in IE 8-10, so that
                 // jQuery etc. can work correctly.
@@ -2726,12 +2719,17 @@ class OutputPage extends ContextSource {
                         );
                         $this->rlExemptStyleModules = $exemptGroups;
  
-                       // Manually handled by getBottomScripts()
-                       $userModule = $rl->getModule( 'user' );
-                       $userState = $userModule->isKnownEmpty( $context ) && !$this->isUserJsPreview()
-                               ? 'ready'
-                               : 'loading';
-                       $this->rlUserModuleState = $exemptStates['user'] = $userState;
+                       $isUserModuleFiltered = !$this->filterModules( [ 'user' ] );
+                       // If this page filters out 'user', makeResourceLoaderLink will drop it.
+                       // Avoid indefinite "loading" state or untrue "ready" state (T145368).
+                       if ( !$isUserModuleFiltered ) {
+                               // Manually handled by getBottomScripts()
+                               $userModule = $rl->getModule( 'user' );
+                               $userState = $userModule->isKnownEmpty( $context ) && !$this->isUserJsPreview()
+                                       ? 'ready'
+                                       : 'loading';
+                               $this->rlUserModuleState = $exemptStates['user'] = $userState;
+                       }
  
                         $rlClient = new ResourceLoaderClientHtml( $context, $this->getTarget() );
                         $rlClient->setConfig( $this->getJSVars() );
@@ -3052,8 +3050,8 @@ class OutputPage extends ContextSource {
                 if ( $user->isLoggedIn() ) {
                         $vars['wgUserId'] = $user->getId();
                         $vars['wgUserEditCount'] = $user->getEditCount();
-                       $userReg = wfTimestampOrNull( TS_UNIX, $user->getRegistration() );
-                       $vars['wgUserRegistration'] = $userReg !== null ? ( $userReg * 1000 ) : null;
+                       $userReg = $user->getRegistration();
+                       $vars['wgUserRegistration'] = $userReg ? wfTimestamp( TS_UNIX, $userReg ) * 1000 : null;
                         // Get the revision ID of the oldest new message on the user's talk
                         // page. This can be used for constructing new message alerts on
                         // the client side.