Follow up r64936. Even better, provide the bug number and imagemagick doc page.

[lhc/web/wiklou.git] / includes / OutputPage.php

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 3685f5d..802740e 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -364,6 +364,16 @@ class OutputPage {
                return true;
        }
 
+       /**
+        * Override the last modified timestamp
+        *
+        * @param $timestamp String: new timestamp, in a format readable by
+        *        wfTimestamp()
+        */
+       public function setLastModified( $timestamp ) {
+               $this->mLastModified = wfTimestamp( TS_RFC2822, $timestamp );
+       }
+
 
        /**
         * Set the robot policy for the page: <http://www.robotstxt.org/meta.html>
@@ -435,7 +445,8 @@ class OutputPage {
        }
 
        /**
-        * "HTML title" means the contents of <title>. It is stored as plain, unescaped text and will be run through htmlspecialchars in the skin file.
+        * "HTML title" means the contents of <title>.
+        * It is stored as plain, unescaped text and will be run through htmlspecialchars in the skin file.
         */
        public function setHTMLTitle( $name ) {
                $this->mHTMLtitle = $name;
@@ -1085,11 +1096,6 @@ class OutputPage {
                                $this->mTemplateIds[$ns] = $dbks;
                        }
                }
-               // Page title
-               $title = $parserOutput->getTitleText();
-               if ( $title != '' ) {
-                       $this->setPageTitle( $title );
-               }
 
                // Hooks registered in the object
                global $wgParserOutputHooks;
@@ -1320,8 +1326,6 @@ class OutputPage {
         * For example:
         *   /w/index.php?title=Main_page should always be served; but
         *   /w/index.php?title=Main_page&variant=zh-cn should never be served.
-        *
-        * patched by Liangent and Philip
         */
        function addAcceptLanguage() {
                global $wgRequest, $wgContLang;
@@ -1903,7 +1907,7 @@ class OutputPage {
                        // Wiki is read only
                        $this->setPageTitle( wfMsg( 'readonly' ) );
                        $reason = wfReadOnlyReason();
-                       $this->wrapWikiMsg( '<div class="mw-readonly-error">\n$1</div>', array( 'readonlytext', $reason ) );
+                       $this->wrapWikiMsg( "<div class='mw-readonly-error'>\n$1</div>", array( 'readonlytext', $reason ) );
                }
 
                // Show source, if supplied
@@ -2118,7 +2122,7 @@ class OutputPage {
                        }
                        $this->addMeta( 'http:Content-Type', "$wgMimeType; charset=$wgOutputEncoding" );
                }
-               $ret .= Html::element( 'html', $htmlAttribs ) . "\n";
+               $ret .= Html::openElement( 'html', $htmlAttribs ) . "\n";
 
                $openHead = Html::openElement( 'head' );
                if ( $openHead ) {