Merge "Adjust phan script to run sub-projects"

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

index 6070114..9bae882 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2176,7 +2176,7 @@ class OutputPage extends ContextSource {
          * if there isn't one. This is used by Skin to determine whether to enable
          * JavaScript frame-breaking, for clients that don't support X-Frame-Options.
          *
-        * @return string
+        * @return string|false
          */
         public function getFrameOptions() {
                 $config = $this->getConfig();
@@ -2303,7 +2303,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 {
@@ -2740,7 +2740,6 @@ class OutputPage extends ContextSource {
                                 'site.styles',
                                 'noscript',
                                 'user.styles',
-                               'user.cssprefs',
                         ] );
                         $this->getSkin()->setupSkinUserCss( $this );
  
@@ -2853,6 +2852,14 @@ class OutputPage extends ContextSource {
                 $bodyClasses[] = $userdir;
                 $bodyClasses[] = "sitedir-$sitedir";
  
+               $underline = $this->getUser()->getOption( 'underline' );
+               if ( $underline < 2 ) {
+                       // The following classes can be used here:
+                       // * mw-underline-always
+                       // * mw-underline-never
+                       $bodyClasses[] = 'mw-underline-' . ( $underline ? 'always' : 'never' );
+               }
+
                 if ( $this->getLanguage()->capitalizeAllNouns() ) {
                         # A <body> class is probably not the best way to do this . . .
                         $bodyClasses[] = 'capitalize-all-nouns';