performance tweak related to title conversion
[lhc/web/wiklou.git] / includes / OutputPage.php
index 948fc41..0e8d533 100644 (file)
@@ -1,14 +1,24 @@
 <?php
+/**
+ * @version $Id$
+ * @package MediaWiki
+ */
 
-# This is not a valid entry point, perform no further processing unless MEDIAWIKI is defined
-if( defined( "MEDIAWIKI" ) ) {
+/**
+ * This is not a valid entry point, perform no further processing unless MEDIAWIKI is defined
+ */
+if( defined( 'MEDIAWIKI' ) ) {
 
 # See design.doc
 
-if($wgUseTeX) require_once( "Math.php" );
+if($wgUseTeX) require_once( 'Math.php' );
 
 define( 'RLH_FOR_UPDATE', 1 );
 
+/**
+ * @todo document
+ * @package MediaWiki
+ */
 class OutputPage {
        var $mHeaders, $mCookies, $mMetatags, $mKeywords;
        var $mLinktags, $mPagetitle, $mBodytext, $mDebugtext;
@@ -26,14 +36,17 @@ class OutputPage {
        var $mShowFeedLinks = false;
        var $mEnableClientCache = true;
 
-       function OutputPage()
-       {
+       /**
+        * Constructor
+        * Initialise private variables
+        */
+       function OutputPage() {
                $this->mHeaders = $this->mCookies = $this->mMetatags =
                $this->mKeywords = $this->mLinktags = array();
                $this->mHTMLtitle = $this->mPagetitle = $this->mBodytext =
                $this->mRedirect = $this->mLastModified =
                $this->mSubtitle = $this->mDebugtext = $this->mRobotpolicy =
-               $this->mOnloadHandler = "";
+               $this->mOnloadHandler = '';
                $this->mIsArticleRelated = $this->mIsarticle = $this->mPrintable = true;
                $this->mSuppressQuickbar = $this->mPrintable = false;
                $this->mLanguageLinks = array();
@@ -42,10 +55,10 @@ class OutputPage {
                $this->mContainsOldMagic = $this->mContainsNewMagic = 0;
                $this->mParserOptions = ParserOptions::newFromUser( $temp = NULL );
                $this->mSquidMaxage = 0;
-               $this->mScripts = "";
+               $this->mScripts = '';
        }
 
-       function addHeader( $name, $val ) { array_push( $this->mHeaders, "$name: $val" ) ; }
+       function addHeader( $name, $val ) { array_push( $this->mHeaders, $name.': '.$val ) ; }
        function addCookie( $name, $val ) { array_push( $this->mCookies, array( $name, $val ) ); }
        function redirect( $url, $responsecode = '302' ) { $this->mRedirect = $url; $this->mRedirectCode = $responsecode; }
 
@@ -63,18 +76,20 @@ class OutputPage {
        function addMetadataLink( $linkarr ) {
                # note: buggy CC software only reads first "meta" link
                static $haveMeta = false;
-               $linkarr["rel"] = ($haveMeta) ? "alternate meta" : "meta";
+               $linkarr['rel'] = ($haveMeta) ? 'alternate meta' : 'meta';
                $this->addLink( $linkarr );
                $haveMeta = true;
        }
 
-       # checkLastModified tells the client to use the client-cached page if
-       # possible. If sucessful, the OutputPage is disabled so that
-       # any future call to OutputPage->output() have no effect. The method
-       # returns true iff cache-ok headers was sent.
-       function checkLastModified ( $timestamp )
-       {
+       /**
+        * checkLastModified tells the client to use the client-cached page if
+        * possible. If sucessful, the OutputPage is disabled so that
+        * any future call to OutputPage->output() have no effect. The method
+        * returns true iff cache-ok headers was sent.
+        */
+       function checkLastModified ( $timestamp ) {
                global $wgLang, $wgCachePages, $wgUser;
+               $timestamp=wfTimestamp(TS_MW,$timestamp);
                if( !$wgCachePages ) {
                        wfDebug( "CACHE DISABLED\n", false );
                        return;
@@ -84,22 +99,21 @@ class OutputPage {
                        wfDebug( "-- bad client, not caching\n", false );
                        return;
                }
-               if( $wgUser->getOption( "nocache" ) ) {
+               if( $wgUser->getOption( 'nocache' ) ) {
                        wfDebug( "USER DISABLED CACHE\n", false );
                        return;
                }
 
-               $lastmod = gmdate( "D, j M Y H:i:s", wfTimestamp2Unix( max( $timestamp, $wgUser->mTouched ) ) ) . " GMT";
+               $lastmod = gmdate( 'D, j M Y H:i:s', wfTimestamp(TS_UNIX, max( $timestamp, $wgUser->mTouched ) ) ) . ' GMT';
 
-               if( !empty( $_SERVER["HTTP_IF_MODIFIED_SINCE"] ) ) {
+               if( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
                        # IE sends sizes after the date like this:
                        # Wed, 20 Aug 2003 06:51:19 GMT; length=5202
                        # this breaks strtotime().
                        $modsince = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
-                       $ismodsince = wfUnix2Timestamp( strtotime( $modsince ) );
+                       $ismodsince = wfTimestamp( TS_MW, strtotime( $modsince ) );
                        wfDebug( "-- client send If-Modified-Since: " . $modsince . "\n", false );
                        wfDebug( "--  we might send Last-Modified : $lastmod\n", false );
-
                        if( ($ismodsince >= $timestamp ) and $wgUser->validateCache( $ismodsince ) ) {
                                # Make sure you're in a place you can leave when you call us!
                                header( "HTTP/1.0 304 Not Modified" );
@@ -143,18 +157,20 @@ class OutputPage {
                                return '';
                }
        }
+
        function setRobotpolicy( $str ) { $this->mRobotpolicy = $str; }
        function setHTMLTitle( $name ) {$this->mHTMLtitle = $name; }
        function setPageTitle( $name ) {
-               global $action;
+               global $action, $wgContLang;
+               $name = $wgContLang->autoConvert($name);
                $this->mPagetitle = $name;
                if(!empty($action)) {
                        $taction =  $this->getPageTitleActionText();
                        if( !empty( $taction ) ) {
-                               $name .= " - $taction";
+                               $name .= ' - '.$taction;
                        }
                }
-               $this->setHTMLTitle( $name . " - " . wfMsg( "wikititlesuffix" ) );
+               $this->setHTMLTitle( $name . ' - ' . wfMsg( 'wikititlesuffix' ) );
        }
        function getHTMLTitle() { return $this->mHTMLtitle; }
        function getPageTitle() { return $this->mPagetitle; }
@@ -169,8 +185,7 @@ class OutputPage {
        function getOnloadHandler() { return $this->mOnloadHandler; }
        function disable() { $this->mDoNothing = true; }
 
-       function setArticleRelated( $v )
-       {
+       function setArticleRelated( $v ) {
                $this->mIsArticleRelated = $v;
                if ( !$v ) {
                        $this->mIsarticle = false;
@@ -183,20 +198,16 @@ class OutputPage {
                }
        }
 
-       function isArticleRelated()
-       {
-               return $this->mIsArticleRelated;
-       }
+       function isArticleRelated() { return $this->mIsArticleRelated; }
 
-       function getLanguageLinks() {
-               return $this->mLanguageLinks;
-       }
+       function getLanguageLinks() { return $this->mLanguageLinks; }
        function addLanguageLinks($newLinkArray) {
                $this->mLanguageLinks += $newLinkArray;
        }
        function setLanguageLinks($newLinkArray) {
                $this->mLanguageLinks = $newLinkArray;
        }
+
        function getCategoryLinks() {
                return $this->mCategoryLinks;
        }
@@ -211,36 +222,43 @@ class OutputPage {
        function isQuickbarSuppressed() { return $this->mSuppressQuickbar; }
 
        function addHTML( $text ) { $this->mBodytext .= $text; }
+       function clearHTML() { $this->mBodytext = ''; }
        function debug( $text ) { $this->mDebugtext .= $text; }
 
-       function setParserOptions( $options )
-       {
+       function setParserOptions( $options ) {
                return wfSetVar( $this->mParserOptions, $options );
        }
 
-       # Convert wikitext to HTML and add it to the buffer
-       #
-       function addWikiText( $text, $linestart = true )
-       {
-               global $wgParser, $wgTitle;
+       /**
+        * Convert wikitext to HTML and add it to the buffer
+        */
+       function addWikiText( $text, $linestart = true ) {
+               global $wgParser, $wgTitle, $wgUseTidy;
 
                $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, $linestart );
+               if ($wgUseTidy) {
+                       $text = Parser::tidy($text);
+               }
                $this->mLanguageLinks += $parserOutput->getLanguageLinks();
                $this->mCategoryLinks += $parserOutput->getCategoryLinks();
                $this->addHTML( $parserOutput->getText() );
        }
 
-       # Add wikitext to the buffer, assuming that this is the primary text for a page view
-       # Saves the text into the parser cache if possible
-       #
+       /**
+        * Add wikitext to the buffer, assuming that this is the primary text for a page view
+        * Saves the text into the parser cache if possible
+        */
        function addPrimaryWikiText( $text, $cacheArticle ) {
-               global $wgParser, $wgParserCache, $wgUser, $wgTitle;
+               global $wgParser, $wgParserCache, $wgUser, $wgTitle, $wgUseTidy;
 
                $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, true );
 
                # Replace link holders
                $text = $parserOutput->getText();
                $this->replaceLinkHolders( $text );
+               if ($wgUseTidy) {
+                       $text = Parser::tidy($text);
+               }
                $parserOutput->setText( $text );
                
                if ( $cacheArticle ) {
@@ -251,7 +269,11 @@ class OutputPage {
                $this->mCategoryLinks += $parserOutput->getCategoryLinks();
                $this->addHTML( $text );
        }
-       
+
+       /**
+        * @param $article
+        * @param $user
+        */
        function tryParserCache( $article, $user ) {
                global $wgParserCache;
                $parserOutput = $wgParserCache->get( $article, $user );
@@ -265,12 +287,18 @@ class OutputPage {
                }
        }
 
-       # Set the maximum cache time on the Squid in seconds
+       /**
+        * Set the maximum cache time on the Squid in seconds
+        * @param $maxage
+        */
        function setSquidMaxage( $maxage ) {
                $this->mSquidMaxage = $maxage;
        }
 
-       # Use enableClientCache(false) to force it to send nocache headers
+       /**
+        * Use enableClientCache(false) to force it to send nocache headers
+        * @param $state
+        */
        function enableClientCache( $state ) {
                return wfSetVar( $this->mEnableClientCache, $state );
        }
@@ -278,9 +306,9 @@ class OutputPage {
        function sendCacheControl() {
                global $wgUseSquid, $wgUseESI;
                # FIXME: This header may cause trouble with some versions of Internet Explorer
-               header( "Vary: Accept-Encoding, Cookie" );
+               header( 'Vary: Accept-Encoding, Cookie' );
                if( $this->mEnableClientCache ) {
-                       if( $wgUseSquid && ! isset( $_COOKIE[ini_get( "session.name") ] ) &&
+                       if( $wgUseSquid && ! isset( $_COOKIE[ini_get( 'session.name') ] ) &&
                          ! $this->isPrintable() && $this->mSquidMaxage != 0 )
                        {
                                if ( $wgUseESI ) {
@@ -315,30 +343,30 @@ class OutputPage {
 
                        # In general, the absence of a last modified header should be enough to prevent
                        # the client from using its cache. We send a few other things just to make sure.
-                       header( "Expires: -1" );
-                       header( "Cache-Control: no-cache, no-store, max-age=0, must-revalidate" );
-                       header( "Pragma: no-cache" );
+                       header( 'Expires: -1' );
+                       header( 'Cache-Control: no-cache, no-store, max-age=0, must-revalidate' );
+                       header( 'Pragma: no-cache' );
                }
        }
 
-       # Finally, all the text has been munged and accumulated into
-       # the object, let's actually output it:
-       #
-       function output()
-       {
+       /**
+        * Finally, all the text has been munged and accumulated into
+        * the object, let's actually output it:
+        */
+       function output() {
                global $wgUser, $wgLang, $wgDebugComments, $wgCookieExpiration;
-               global $wgInputEncoding, $wgOutputEncoding, $wgLanguageCode;
+               global $wgInputEncoding, $wgOutputEncoding, $wgContLanguageCode;
                global $wgDebugRedirects, $wgMimeType, $wgProfiler;
+
                if( $this->mDoNothing ){
                        return;
                }
-               $fname = "OutputPage::output";
+               $fname = 'OutputPage::output';
                wfProfileIn( $fname );
-
                $sk = $wgUser->getSkin();
 
-               if ( "" != $this->mRedirect ) {
-                       if( substr( $this->mRedirect, 0, 4 ) != "http" ) {
+               if ( '' != $this->mRedirect ) {
+                       if( substr( $this->mRedirect, 0, 4 ) != 'http' ) {
                                # Standards require redirect URLs to be absolute
                                global $wgServer;
                                $this->mRedirect = $wgServer . $this->mRedirect;
@@ -347,7 +375,7 @@ class OutputPage {
                                if( !$wgDebugRedirects ) {
                                        header("HTTP/1.1 {$this->mRedirectCode} Moved Permanently");
                                }
-                               $this->mLastModified = gmdate( "D, j M Y H:i:s" ) . " GMT";
+                               $this->mLastModified = gmdate( 'D, j M Y H:i:s' ) . ' GMT';
                        }
 
                        $this->sendCacheControl();
@@ -358,7 +386,7 @@ class OutputPage {
                                print "<p>Location: <a href=\"$url\">$url</a></p>\n";
                                print "</body>\n</html>\n";
                        } else {
-                               header( "Location: {$this->mRedirect}" );
+                               header( 'Location: '.$this->mRedirect );
                        }
                        if ( isset( $wgProfiler ) ) { wfDebug( $wgProfiler->getOutput() ); }
                        return;
@@ -368,43 +396,42 @@ class OutputPage {
                $this->sendCacheControl();
                # Perform link colouring
                $this->transformBuffer();
+               $this->replaceLinkHolders( $this->mSubtitle );
                
                # Disable temporary placeholders, so that the skin produces HTML
                $sk->postParseLinkColour( false );
 
                header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
-               header( "Content-language: {$wgLanguageCode}" );
+               header( 'Content-language: '.$wgContLanguageCode );
 
                $exp = time() + $wgCookieExpiration;
                foreach( $this->mCookies as $name => $val ) {
-                       setcookie( $name, $val, $exp, "/" );
+                       setcookie( $name, $val, $exp, '/' );
                }
 
                $sk->outputPage( $this );
                # flush();
        }
 
-       function out( $ins )
-       {
-               global $wgInputEncoding, $wgOutputEncoding, $wgLang;
+       function out( $ins ) {
+               global $wgInputEncoding, $wgOutputEncoding, $wgContLang;
                if ( 0 == strcmp( $wgInputEncoding, $wgOutputEncoding ) ) {
                        $outs = $ins;
                } else {
-                       $outs = $wgLang->iconv( $wgInputEncoding, $wgOutputEncoding, $ins );
+                       $outs = $wgContLang->iconv( $wgInputEncoding, $wgOutputEncoding, $ins );
                        if ( false === $outs ) { $outs = $ins; }
                }
                print $outs;
        }
 
-       function setEncodings()
-       {
+       function setEncodings() {
                global $wgInputEncoding, $wgOutputEncoding;
-               global $wgUser, $wgLang;
+               global $wgUser, $wgContLang;
 
                $wgInputEncoding = strtolower( $wgInputEncoding );
 
                if( $wgUser->getOption( 'altencoding' ) ) {
-                       $wgLang->setAltEncoding();
+                       $wgContLang->setAltEncoding();
                        return;
                }
 
@@ -444,20 +471,21 @@ class OutputPage {
                $wgOutputEncoding = $wgInputEncoding;
        }
 
-       # Returns a HTML comment with the elapsed time since request.
-       # This method has no side effects.
-       function reportTime()
-       {
+       /**
+        * Returns a HTML comment with the elapsed time since request.
+        * This method has no side effects.
+        */
+       function reportTime() {
                global $wgRequestTime;
 
                $now = wfTime();
-               list( $usec, $sec ) = explode( " ", $wgRequestTime );
+               list( $usec, $sec ) = explode( ' ', $wgRequestTime );
                $start = (float)$sec + (float)$usec;
                $elapsed = $now - $start;
 
                # Use real server name if available, so we know which machine
                # in a server farm generated the current page.
-               if ( function_exists( "posix_uname" ) ) {
+               if ( function_exists( 'posix_uname' ) ) {
                        $uname = @posix_uname();
                } else {
                        $uname = false;
@@ -473,101 +501,99 @@ class OutputPage {
                return $com;
        }
 
-       # Note: these arguments are keys into wfMsg(), not text!
-       #
-       function errorpage( $title, $msg )
-       {
+       /**
+        * Note: these arguments are keys into wfMsg(), not text!
+        */
+       function errorpage( $title, $msg ) {
                global $wgTitle;
 
-               $this->mDebugtext .= "Original title: " .
+               $this->mDebugtext .= 'Original title: ' .
                  $wgTitle->getPrefixedText() . "\n";
                $this->setPageTitle( wfMsg( $title ) );
-               $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
-               $this->setRobotpolicy( "noindex,nofollow" );
+               $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
+               $this->setRobotpolicy( 'noindex,nofollow' );
                $this->setArticleRelated( false );
+               $this->suppressQuickbar();
+               
                $this->enableClientCache( false );
-               $this->mRedirect = "";
+               $this->mRedirect = '';
 
-               $this->mBodytext = "";
-               $this->addHTML( "<p>" . wfMsg( $msg ) . "</p>\n" );
+               $this->mBodytext = '';
+               $this->addHTML( '<p>' . wfMsg( $msg ) . "</p>\n" );
                $this->returnToMain( false );
 
                $this->output();
                wfErrorExit();
        }
 
-       function sysopRequired()
-       {
+       function sysopRequired() {
                global $wgUser;
 
-               $this->setPageTitle( wfMsg( "sysoptitle" ) );
-               $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
-               $this->setRobotpolicy( "noindex,nofollow" );
+               $this->setPageTitle( wfMsg( 'sysoptitle' ) );
+               $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
+               $this->setRobotpolicy( 'noindex,nofollow' );
                $this->setArticleRelated( false );
-               $this->mBodytext = "";
+               $this->mBodytext = '';
 
                $sk = $wgUser->getSkin();
-               $ap = $sk->makeKnownLink( wfMsg( "administrators" ), "" );
-               $this->addHTML( wfMsg( "sysoptext", $ap ) );
+               $ap = $sk->makeKnownLink( wfMsgForContent( 'administrators' ), '' );
+               $this->addHTML( wfMsg( 'sysoptext', $ap ) );
                $this->returnToMain();
        }
 
-       function developerRequired()
-       {
+       function developerRequired() {
                global $wgUser;
 
-               $this->setPageTitle( wfMsg( "developertitle" ) );
-               $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
-               $this->setRobotpolicy( "noindex,nofollow" );
+               $this->setPageTitle( wfMsg( 'developertitle' ) );
+               $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
+               $this->setRobotpolicy( 'noindex,nofollow' );
                $this->setArticleRelated( false );
-               $this->mBodytext = "";
+               $this->mBodytext = '';
 
                $sk = $wgUser->getSkin();
-               $ap = $sk->makeKnownLink( wfMsg( "administrators" ), "" );
-               $this->addHTML( wfMsg( "developertext", $ap ) );
+               $ap = $sk->makeKnownLink( wfMsgForContent( 'administrators' ), '' );
+               $this->addHTML( wfMsg( 'developertext', $ap ) );
                $this->returnToMain();
        }
 
-       function loginToUse()
-       {
-               global $wgUser, $wgTitle, $wgLang;
+       function loginToUse() {
+               global $wgUser, $wgTitle, $wgContLang;
 
-               $this->setPageTitle( wfMsg( "loginreqtitle" ) );
-               $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
-               $this->setRobotpolicy( "noindex,nofollow" );
+               $this->setPageTitle( wfMsg( 'loginreqtitle' ) );
+               $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
+               $this->setRobotpolicy( 'noindex,nofollow' );
                $this->setArticleFlag( false );
-               $this->mBodytext = "";
-               $this->addWikiText( wfMsg( "loginreqtext" ) );
+               $this->mBodytext = '';
+               $this->addWikiText( wfMsg( 'loginreqtext' ) );
 
                # We put a comment in the .html file so a Sysop can diagnose the page the
                # user can't see.
                $this->addHTML( "\n<!--" .
-                                               $wgLang->getNsText( $wgTitle->getNamespace() ) .
-                                               ":" .
-                                               $wgTitle->getDBkey() . "-->" );
+                                               $wgContLang->getNsText( $wgTitle->getNamespace() ) .
+                                               ':' .
+                                               $wgTitle->getDBkey() . '-->' );
                $this->returnToMain();          # Flip back to the main page after 10 seconds.
        }
 
-       function databaseError( $fname, $sql, $error, $errno )
-       {
+       function databaseError( $fname, $sql, $error, $errno ) {
                global $wgUser, $wgCommandLineMode;
 
-               $this->setPageTitle( wfMsgNoDB( "databaseerror" ) );
-               $this->setRobotpolicy( "noindex,nofollow" );
+               $this->setPageTitle( wfMsgNoDB( 'databaseerror' ) );
+               $this->setRobotpolicy( 'noindex,nofollow' );
                $this->setArticleRelated( false );
                $this->enableClientCache( false );
-               $this->mRedirect = "";
+               $this->mRedirect = '';
 
                if ( $wgCommandLineMode ) {
-                       $msg = wfMsgNoDB( "dberrortextcl", htmlspecialchars( $sql ),
+                       $msg = wfMsgNoDB( 'dberrortextcl', htmlspecialchars( $sql ),
                                                htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
                } else {
-                       $msg = wfMsgNoDB( "dberrortext", htmlspecialchars( $sql ),
+                       $msg = wfMsgNoDB( 'dberrortext', htmlspecialchars( $sql ),
                                                htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
                }
 
                if ( $wgCommandLineMode || !is_object( $wgUser )) {
-                       print "$msg\n";
+                       print $msg."\n";
                        wfErrorExit();
                }
                $this->mBodytext = $msg;
@@ -575,28 +601,27 @@ class OutputPage {
                wfErrorExit();
        }
 
-       function readOnlyPage( $source = null, $protected = false )
-       {
+       function readOnlyPage( $source = null, $protected = false ) {
                global $wgUser, $wgReadOnlyFile;
 
-               $this->setRobotpolicy( "noindex,nofollow" );
+               $this->setRobotpolicy( 'noindex,nofollow' );
                $this->setArticleRelated( false );
 
                if( $protected ) {
-                       $this->setPageTitle( wfMsg( "viewsource" ) );
-                       $this->addWikiText( wfMsg( "protectedtext" ) );
+                       $this->setPageTitle( wfMsg( 'viewsource' ) );
+                       $this->addWikiText( wfMsg( 'protectedtext' ) );
                } else {
-                       $this->setPageTitle( wfMsg( "readonly" ) );
+                       $this->setPageTitle( wfMsg( 'readonly' ) );
                        $reason = file_get_contents( $wgReadOnlyFile );
-                       $this->addWikiText( wfMsg( "readonlytext", $reason ) );
+                       $this->addWikiText( wfMsg( 'readonlytext', $reason ) );
                }
 
                if( is_string( $source ) ) {
-                       if( strcmp( $source, "" ) == 0 ) {
-                               $source = wfMsg( "noarticletext" );
+                       if( strcmp( $source, '' ) == 0 ) {
+                               $source = wfMsg( 'noarticletext' );
                        }
-                       $rows = $wgUser->getOption( "rows" );
-                       $cols = $wgUser->getOption( "cols" );
+                       $rows = $wgUser->getOption( 'rows' );
+                       $cols = $wgUser->getOption( 'cols' );
                        $text = "\n<textarea cols='$cols' rows='$rows' readonly='readonly'>" .
                                htmlspecialchars( $source ) . "\n</textarea>";
                        $this->addHTML( $text );
@@ -605,49 +630,44 @@ class OutputPage {
                $this->returnToMain( false );
        }
 
-       function fatalError( $message )
-       {
+       function fatalError( $message ) {
                $this->setPageTitle( wfMsg( "internalerror" ) );
                $this->setRobotpolicy( "noindex,nofollow" );
                $this->setArticleRelated( false );
                $this->enableClientCache( false );
-               $this->mRedirect = "";
+               $this->mRedirect = '';
 
                $this->mBodytext = $message;
                $this->output();
                wfErrorExit();
        }
 
-       function unexpectedValueError( $name, $val )
-       {
-               $this->fatalError( wfMsg( "unexpected", $name, $val ) );
+       function unexpectedValueError( $name, $val ) {
+               $this->fatalError( wfMsg( 'unexpected', $name, $val ) );
        }
 
-       function fileCopyError( $old, $new )
-       {
-               $this->fatalError( wfMsg( "filecopyerror", $old, $new ) );
+       function fileCopyError( $old, $new ) {
+               $this->fatalError( wfMsg( 'filecopyerror', $old, $new ) );
        }
 
-       function fileRenameError( $old, $new )
-       {
-               $this->fatalError( wfMsg( "filerenameerror", $old, $new ) );
+       function fileRenameError( $old, $new ) {
+               $this->fatalError( wfMsg( 'filerenameerror', $old, $new ) );
        }
 
-       function fileDeleteError( $name )
-       {
-               $this->fatalError( wfMsg( "filedeleteerror", $name ) );
+       function fileDeleteError( $name ) {
+               $this->fatalError( wfMsg( 'filedeleteerror', $name ) );
        }
 
-       function fileNotFoundError( $name )
-       {
-               $this->fatalError( wfMsg( "filenotfound", $name ) );
+       function fileNotFoundError( $name ) {
+               $this->fatalError( wfMsg( 'filenotfound', $name ) );
        }
 
-       // return from error messages or notes
-       //   auto:      automatically redirect the user after 10 seconds
-       //   returnto:  page title to return to. Default is Main Page.
-       function returnToMain( $auto = true, $returnto = NULL )
-       {
+       /**
+        * return from error messages or notes
+        * @param $auto automatically redirect the user after 10 seconds
+        * @param $returnto page title to return to. Default is Main Page.
+        */
+       function returnToMain( $auto = true, $returnto = NULL ) {
                global $wgUser, $wgOut, $wgRequest;
 
                if ( $returnto == NULL ) {
@@ -655,48 +675,51 @@ class OutputPage {
                }
 
                $sk = $wgUser->getSkin();
-               if ( "" == $returnto ) {
-                       $returnto = wfMsg( "mainpage" );
+               if ( '' == $returnto ) {
+                       $returnto = wfMsgForContent( 'mainpage' );
                }
-               $link = $sk->makeKnownLink( $returnto, "" );
+               $link = $sk->makeKnownLink( $returnto, '' );
 
-               $r = wfMsg( "returnto", $link );
+               $r = wfMsg( 'returnto', $link );
                if ( $auto ) {
                        $titleObj = Title::newFromText( $returnto );
-                       $wgOut->addMeta( "http:Refresh", "10;url=" . $titleObj->escapeFullURL() );
+                       $wgOut->addMeta( 'http:Refresh', '10;url=' . $titleObj->escapeFullURL() );
                }
                $wgOut->addHTML( "\n<p>$r</p>\n" );
        }
 
-       # This function takes the existing and broken links for the page
-       # and uses the first 10 of them for META keywords
-       function addMetaTags ()
-       {
+       /**
+        * This function takes the existing and broken links for the page
+        * and uses the first 10 of them for META keywords
+        */
+       function addMetaTags () {
                global $wgLinkCache , $wgOut ;
                $good = array_keys ( $wgLinkCache->mGoodLinks ) ;
                $bad = array_keys ( $wgLinkCache->mBadLinks ) ;
                $a = array_merge ( $good , $bad ) ;
                $a = array_slice ( $a , 0 , 10 ) ; # 10 keywords max
-               $a = implode ( "," , $a ) ;
+               $a = implode ( ',' , $a ) ;
                $strip = array(
                        "/<.*?" . ">/" => '',
                        "/[_]/" => ' '
                );
                $a = htmlspecialchars(preg_replace(array_keys($strip), array_values($strip),$a ));
 
-               $wgOut->addMeta ( "KEYWORDS" , $a ) ;
+               $wgOut->addMeta ( 'KEYWORDS' , $a ) ;
        }
 
-       /* private */ function headElement()
-       {
-               global $wgDocType, $wgDTD, $wgLanguageCode, $wgOutputEncoding, $wgMimeType;
-               global $wgUser, $wgLang, $wgRequest;
+       /**
+        * @private
+        */
+       function headElement() {
+               global $wgDocType, $wgDTD, $wgContLanguageCode, $wgOutputEncoding, $wgMimeType;
+               global $wgUser, $wgContLang, $wgRequest;
 
                $xml = ($wgMimeType == 'text/xml');
                if( $xml ) {
                        $ret = "<" . "?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?" . ">\n";
                } else {
-                       $ret = "";
+                       $ret = '';
                }
 
                $ret .= "<!DOCTYPE html PUBLIC \"$wgDocType\"\n        \"$wgDTD\">\n";
@@ -707,21 +730,21 @@ class OutputPage {
                if( $xml ) {
                        $xmlbits = "xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\"";
                } else {
-                       $xmlbits = "";
+                       $xmlbits = '';
                }
-               $rtl = $wgLang->isRTL() ? " dir='RTL'" : "";
-               $ret .= "<html $xmlbits lang=\"$wgLanguageCode\" $rtl>\n";
+               $rtl = $wgContLang->isRTL() ? " dir='RTL'" : '';
+               $ret .= "<html $xmlbits lang=\"$wgContLanguageCode\" $rtl>\n";
                $ret .= "<head>\n<title>" . htmlspecialchars( $this->mHTMLtitle ) . "</title>\n";
                array_push( $this->mMetatags, array( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" ) );
 
                $ret .= $this->getHeadLinks();
                global $wgStylePath;
                if( $this->isPrintable() ) {
-                       $media = "";
+                       $media = '';
                } else {
                        $media = "media='print'";
                }
-               $printsheet = htmlspecialchars( "$wgStylePath/wikiprintable.css" );
+               $printsheet = htmlspecialchars( "$wgStylePath/common/wikiprintable.css" );
                $ret .= "<link rel='stylesheet' type='text/css' $media href='$printsheet' />\n";
 
                $sk = $wgUser->getSkin();
@@ -735,18 +758,18 @@ class OutputPage {
 
        function getHeadLinks() {
                global $wgRequest, $wgStylePath;
-               $ret = "";
+               $ret = '';
                foreach ( $this->mMetatags as $tag ) {
-                       if ( 0 == strcasecmp( "http:", substr( $tag[0], 0, 5 ) ) ) {
-                               $a = "http-equiv";
+                       if ( 0 == strcasecmp( 'http:', substr( $tag[0], 0, 5 ) ) ) {
+                               $a = 'http-equiv';
                                $tag[0] = substr( $tag[0], 5 );
                        } else {
-                               $a = "name";
+                               $a = 'name';
                        }
                        $ret .= "<meta $a=\"{$tag[0]}\" content=\"{$tag[1]}\" />\n";
                }
                $p = $this->mRobotpolicy;
-               if ( "" == $p ) { $p = "index,follow"; }
+               if ( '' == $p ) { $p = 'index,follow'; }
                $ret .= "<meta name=\"robots\" content=\"$p\" />\n";
 
                if ( count( $this->mKeywords ) > 0 ) {
@@ -758,7 +781,7 @@ class OutputPage {
                          htmlspecialchars(preg_replace(array_keys($strip), array_values($strip),implode( ",", $this->mKeywords ))) . "\" />\n";
                }
                foreach ( $this->mLinktags as $tag ) {
-                       $ret .= "<link";
+                       $ret .= '<link';
                        foreach( $tag as $attr => $val ) {
                                $ret .= " $attr=\"" . htmlspecialchars( $val ) . "\"";
                        }
@@ -766,9 +789,9 @@ class OutputPage {
                }
                if( $this->isSyndicated() ) {
                        # FIXME: centralize the mime-type and name information in Feed.php
-                       $link = $wgRequest->escapeAppendQuery( "feed=rss" );
+                       $link = $wgRequest->escapeAppendQuery( 'feed=rss' );
                        $ret .= "<link rel='alternate' type='application/rss+xml' title='RSS 2.0' href='$link' />\n";
-                       $link = $wgRequest->escapeAppendQuery( "feed=atom" );
+                       $link = $wgRequest->escapeAppendQuery( 'feed=atom' );
                        $ret .= "<link rel='alternate' type='application/rss+atom' title='Atom 0.3' href='$link' />\n";
                }
                # FIXME: get these working
@@ -777,21 +800,24 @@ class OutputPage {
                return $ret;
        }
        
-       # Run any necessary pre-output transformations on the buffer text
-       function transformBuffer( $options = 0 )
-       {
+       /**
+        * Run any necessary pre-output transformations on the buffer text
+        */
+       function transformBuffer( $options = 0 ) {
                $this->replaceLinkHolders( $this->mBodytext, $options );
        }
 
-       # Replace <!--LINK--> link placeholders with actual links, in the buffer
-       # Placeholders created in Skin::makeLinkObj()
-       # Returns an array of links found, indexed by PDBK:
-       #   0 - broken
-       #   1 - normal link
-       #   2 - stub
-       # $options is a bit field, RLH_FOR_UPDATE to select for update
+       /**
+        * Replace <!--LINK--> link placeholders with actual links, in the buffer
+        * Placeholders created in Skin::makeLinkObj()
+        * Returns an array of links found, indexed by PDBK:
+        *  0 - broken
+        *  1 - normal link
+        *  2 - stub
+        * $options is a bit field, RLH_FOR_UPDATE to select for update
+        */
        function replaceLinkHolders( &$text, $options = 0 ) {
-               global $wgUser, $wgLinkCache, $wgUseOldExistenceCheck;
+               global $wgUser, $wgLinkCache, $wgUseOldExistenceCheck, $wgLinkHolders;
                
                if ( $wgUseOldExistenceCheck ) {
                        return array();
@@ -800,36 +826,25 @@ class OutputPage {
                $fname = 'OutputPage::replaceLinkHolders';
                wfProfileIn( $fname );
 
-               $titles = array();
                $pdbks = array();
                $colours = array();
                
-               # Get placeholders from body
-               wfProfileIn( "$fname-match" );
-               preg_match_all( "/<!--LINK (.*?) (.*?) (.*?) (.*?)-->/", $text, $tmpLinks );
-               wfProfileOut( "$fname-match" );
-               
-               if ( !empty( $tmpLinks[0] ) ) {
-                       wfProfileIn( "$fname-check" );
+               #if ( !empty( $tmpLinks[0] ) ) { #TODO
+               if ( !empty( $wgLinkHolders['namespaces'] ) ) {
+                       wfProfileIn( $fname.'-check' );
                        $dbr =& wfGetDB( DB_SLAVE );
                        $cur = $dbr->tableName( 'cur' );
                        $sk = $wgUser->getSkin();
                        $threshold = $wgUser->getOption('stubthreshold');
                        
-                       $namespaces =& $tmpLinks[1];
-                       $dbkeys =& $tmpLinks[2];
-                       $queries =& $tmpLinks[3];
-                       $texts =& $tmpLinks[4];
-
                        # Sort by namespace
-                       asort( $namespaces );
+                       asort( $wgLinkHolders['namespaces'] );
        
                        # Generate query
                        $query = false;
-                       foreach ( $namespaces as $key => $val ) {
+                       foreach ( $wgLinkHolders['namespaces'] as $key => $val ) {
                                # Make title object
-                               $dbk = $dbkeys[$key];
-                               $title = $titles[$key] = Title::makeTitle( $val, $dbk );
+                               $title = $wgLinkHolders['titles'][$key];
 
                                # Skip invalid entries.
                                # Result will be ugly, but prevents crash.
@@ -856,16 +871,16 @@ class OutputPage {
                                                $current = $val;
                                                $query .= ")) OR (cur_namespace=$val AND cur_title IN(";
                                        } else {
-                                               $query .= ", ";
+                                               $query .= ', ';
                                        }
                                
-                                       $query .= $dbr->addQuotes( $dbkeys[$key] );
+                                       $query .= $dbr->addQuotes( $wgLinkHolders['dbkeys'][$key] );
                                }
                        }
                        if ( $query ) {
-                               $query .= "))";
+                               $query .= '))';
                                if ( $options & RLH_FOR_UPDATE ) {
-                                       $query .= " FOR UPDATE";
+                                       $query .= ' FOR UPDATE';
                                }
                        
                                $res = $dbr->query( $query, $fname );
@@ -891,37 +906,53 @@ class OutputPage {
                                        }
                                }
                        }
-                       wfProfileOut( "$fname-check" );
+                       wfProfileOut( $fname.'-check' );
                        
                        # Construct search and replace arrays
-                       wfProfileIn( "$fname-construct" );
+                       wfProfileIn( $fname.'-construct' );
                        global $outputReplace;
                        $outputReplace = array();
-                       foreach ( $namespaces as $key => $ns ) {
+                       foreach ( $wgLinkHolders['namespaces'] as $key => $ns ) {
                                $pdbk = $pdbks[$key];
-                               $searchkey = $tmpLinks[0][$key];
-                               $title = $titles[$key];
+                               $searchkey = '<!--LINK '.$key.'-->';
+                               $title = $wgLinkHolders['titles'][$key];
                                if ( empty( $colours[$pdbk] ) ) {
                                        $wgLinkCache->addBadLink( $pdbk );
                                        $colours[$pdbk] = 0;
-                                       $outputReplace[$searchkey] = $sk->makeBrokenLinkObj( $title, $texts[$key], $queries[$key] );
+                                       $outputReplace[$searchkey] = $sk->makeBrokenLinkObj( $title,
+                                                                       $wgLinkHolders['texts'][$key],
+                                                                       $wgLinkHolders['queries'][$key] );
                                } elseif ( $colours[$pdbk] == 1 ) {
-                                       $outputReplace[$searchkey] = $sk->makeKnownLinkObj( $title, $texts[$key], $queries[$key] );
+                                       $outputReplace[$searchkey] = $sk->makeKnownLinkObj( $title,
+                                                                       $wgLinkHolders['texts'][$key],
+                                                                       $wgLinkHolders['queries'][$key] );
                                } elseif ( $colours[$pdbk] == 2 ) {
-                                       $outputReplace[$searchkey] = $sk->makeStubLinkObj( $title, $texts[$key], $queries[$key] );
+                                       $outputReplace[$searchkey] = $sk->makeStubLinkObj( $title,
+                                                                       $wgLinkHolders['texts'][$key],
+                                                                       $wgLinkHolders['queries'][$key] );
                                }
                        }
-                       wfProfileOut( "$fname-construct" );
+                       wfProfileOut( $fname.'-construct' );
 
                        # Do the thing
-                       wfProfileIn( "$fname-replace" );
+                       wfProfileIn( $fname.'-replace' );
                        
                        $text = preg_replace_callback(
-                               '/(<!--LINK .*? .*? .*? .*?-->)/',
+                               '/(<!--LINK .*?-->)/',
+                               "outputReplaceMatches",
+                               $text);
+                       wfProfileOut( $fname.'-replace' );
+
+                       wfProfileIn( $fname.'-interwiki' );
+                       global $wgInterwikiLinkHolders;
+                       $outputReplace = $wgInterwikiLinkHolders;
+                       $text = preg_replace_callback(
+                               '/<!--IWLINK (.*?)-->/',
                                "outputReplaceMatches",
                                $text);
-                       wfProfileOut( "$fname-replace" );
+                       wfProfileOut( $fname.'-interwiki' );
                }
+
                wfProfileOut( $fname );
                return $colours;
        }