Merge "Add dotall modifier to EDITSECTION_REGEX"

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

index bae871e..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 {