* API: (bug 17355) Added auwitheditsonly parameter to list=allusers
[lhc/web/wiklou.git] / includes / OutputPage.php
index 1a55c81..b1a0275 100644 (file)
@@ -7,6 +7,7 @@ if ( ! defined( 'MEDIAWIKI' ) )
  */
 class OutputPage {
        var $mMetatags = array(), $mKeywords = array(), $mLinktags = array();
+       var $mExtStyles = array();
        var $mPagetitle = '', $mBodytext = '', $mDebugtext = '';
        var $mHTMLtitle = '', $mIsarticle = true, $mPrintable = false;
        var $mSubtitle = '', $mRedirect = '', $mStatusCode;
@@ -34,6 +35,13 @@ class OutputPage {
        var $mSquidMaxage = 0;
        var $mRevisionId = null;
 
+       /**
+        * An array of stylesheet filenames (relative from skins path), with options
+        * for CSS media, IE conditions, and RTL/LTR direction.
+        * For internal use; add settings in the skin via $this->addStyle()
+        */
+       var $styles = array();
+
        private $mIndexPolicy = 'index';
        private $mFollowPolicy = 'follow';
 
@@ -64,17 +72,23 @@ class OutputPage {
         */
        function setStatusCode( $statusCode ) { $this->mStatusCode = $statusCode; }
 
-       # To add an http-equiv meta tag, precede the name with "http:"
-       function addMeta( $name, $val ) { array_push( $this->mMetatags, array( $name, $val ) ); }
+       /**
+        * Add a new <meta> tag
+        * To add an http-equiv meta tag, precede the name with "http:"
+        *
+        * @param $name tag name
+        * @param $val tag value
+        */
+       function addMeta( $name, $val ) {
+               array_push( $this->mMetatags, array( $name, $val ) );
+       }
+
        function addKeyword( $text ) { array_push( $this->mKeywords, $text ); }
        function addScript( $script ) { $this->mScripts .= "\t\t".$script; }
-       function addStyle( $style ) {
-               global $wgStylePath, $wgStyleVersion;
-               $this->addLink(
-                               array(
-                                       'rel' => 'stylesheet',
-                                       'href' => $wgStylePath . '/' . $style . '?' . $wgStyleVersion,
-                                       'type' => 'text/css' ) );
+       
+       function addExtensionStyle( $url ) {
+               $linkarr = array( 'rel' => 'stylesheet', 'href' => $url, 'type' => 'text/css' );
+               array_push( $this->mExtStyles, $linkarr );
        }
 
        /**
@@ -88,7 +102,6 @@ class OutputPage {
                } else {
                        $path =  "{$wgStylePath}/common/{$file}";
                }
-               $encPath = htmlspecialchars( $path );
                $this->addScript( "<script type=\"{$wgJsMimeType}\" src=\"$path?$wgStyleVersion\"></script>\n" );
        }
        
@@ -129,6 +142,11 @@ class OutputPage {
                # $linkarr should be an associative array of attributes. We'll escape on output.
                array_push( $this->mLinktags, $linkarr );
        }
+       
+       # Get all links added by extensions
+       function getExtStyle() {
+               return $this->mExtStyles;
+       }
 
        function addMetadataLink( $linkarr ) {
                # note: buggy CC software only reads first "meta" link
@@ -143,62 +161,87 @@ class OutputPage {
         * possible. If sucessful, the OutputPage is disabled so that
         * any future call to OutputPage->output() have no effect.
         *
+        * Side effect: sets mLastModified for Last-Modified header
+        *
         * @return bool True iff cache-ok headers was sent.
         */
        function checkLastModified ( $timestamp ) {
                global $wgCachePages, $wgCacheEpoch, $wgUser, $wgRequest;
-
+               
                if ( !$timestamp || $timestamp == '19700101000000' ) {
                        wfDebug( __METHOD__ . ": CACHE DISABLED, NO TIMESTAMP\n" );
-                       return;
+                       return false;
                }
                if( !$wgCachePages ) {
                        wfDebug( __METHOD__ . ": CACHE DISABLED\n", false );
-                       return;
+                       return false;
                }
                if( $wgUser->getOption( 'nocache' ) ) {
                        wfDebug( __METHOD__ . ": USER DISABLED CACHE\n", false );
-                       return;
+                       return false;
                }
 
-               $timestamp=wfTimestamp(TS_MW,$timestamp);
-               $lastmod = wfTimestamp( TS_RFC2822, max( $timestamp, $wgUser->mTouched, $wgCacheEpoch ) );
+               $timestamp = wfTimestamp( TS_MW, $timestamp );
+               $modifiedTimes = array(
+                       'page' => $timestamp,
+                       'user' => $wgUser->getTouched(),
+                       'epoch' => $wgCacheEpoch
+               );
+               wfRunHooks( 'OutputPageCheckLastModified', array( &$modifiedTimes ) );
 
-               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"] );
+               $maxModified = max( $modifiedTimes );
+               $this->mLastModified = wfTimestamp( TS_RFC2822, $maxModified );
 
-                       wfSuppressWarnings(); // E_STRICT system time bitching
-                       $modsinceTime = strtotime( $modsince );
-                       wfRestoreWarnings();
+               if( empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
+                       wfDebug( __METHOD__ . ": client did not send If-Modified-Since header\n", false );
+                       return false;
+               }
 
-                       $ismodsince = wfTimestamp( TS_MW, $modsinceTime ? $modsinceTime : 1 );
-                       wfDebug( __METHOD__ . ": -- client send If-Modified-Since: " . $modsince . "\n", false );
-                       wfDebug( __METHOD__ . ": --  we might send Last-Modified : $lastmod\n", false );
-                       if( ($ismodsince >= $timestamp ) && $wgUser->validateCache( $ismodsince ) && $ismodsince >= $wgCacheEpoch ) {
-                               # Make sure you're in a place you can leave when you call us!
-                               $wgRequest->response()->header( "HTTP/1.0 304 Not Modified" );
-                               $this->mLastModified = $lastmod;
-                               $this->sendCacheControl();
-                               wfDebug( __METHOD__ . ": CACHED client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );
-                               $this->disable();
+               # Make debug info
+               $info = '';
+               foreach ( $modifiedTimes as $name => $value ) {
+                       if ( $info !== '' ) {
+                               $info .= ', ';
+                       }
+                       $info .= "$name=" . wfTimestamp( TS_ISO_8601, $value );
+               }
 
-                               // Don't output a compressed blob when using ob_gzhandler;
-                               // it's technically against HTTP spec and seems to confuse
-                               // Firefox when the response gets split over two packets.
-                               wfClearOutputBuffers();
+               # IE sends sizes after the date like this:
+               # Wed, 20 Aug 2003 06:51:19 GMT; length=5202
+               # this breaks strtotime().
+               $clientHeader = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
 
-                               return true;
-                       } else {
-                               wfDebug( __METHOD__ . ": READY  client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );
-                               $this->mLastModified = $lastmod;
-                       }
-               } else {
-                       wfDebug( __METHOD__ . ": client did not send If-Modified-Since header\n", false );
-                       $this->mLastModified = $lastmod;
+               wfSuppressWarnings(); // E_STRICT system time bitching
+               $clientHeaderTime = strtotime( $clientHeader );
+               wfRestoreWarnings();
+               if ( !$clientHeaderTime ) {
+                       wfDebug( __METHOD__ . ": unable to parse the client's If-Modified-Since header: $clientHeader\n" );
+                       return false;
+               }
+               $clientHeaderTime = wfTimestamp( TS_MW, $clientHeaderTime );
+
+               wfDebug( __METHOD__ . ": client sent If-Modified-Since: " . 
+                       wfTimestamp( TS_ISO_8601, $clientHeaderTime ) . "\n", false );
+               wfDebug( __METHOD__ . ": effective Last-Modified: " . 
+                       wfTimestamp( TS_ISO_8601, $maxModified ) . "\n", false );
+               if( $clientHeaderTime < $maxModified ) {
+                       wfDebug( __METHOD__ . ": STALE, $info\n", false );
+                       return false;
                }
+
+               # Not modified
+               # Give a 304 response code and disable body output 
+               wfDebug( __METHOD__ . ": NOT MODIFIED, $info\n", false );
+               $wgRequest->response()->header( "HTTP/1.1 304 Not Modified" );
+               $this->sendCacheControl();
+               $this->disable();
+
+               // Don't output a compressed blob when using ob_gzhandler;
+               // it's technically against HTTP spec and seems to confuse
+               // Firefox when the response gets split over two packets.
+               wfClearOutputBuffers();
+
+               return true;
        }
 
        function setPageTitleActionText( $text ) {
@@ -365,7 +408,12 @@ class OutputPage {
                if ( wfRunHooks( 'OutputPageMakeCategoryLinks', array( &$this, $categories, &$this->mCategoryLinks ) ) ) {
                        $sk = $wgUser->getSkin();
                        foreach ( $categories as $category => $type ) {
+                               $origcategory = $category;
                                $title = Title::makeTitleSafe( NS_CATEGORY, $category );
+                               $wgContLang->findVariantLink( $category, $title, true );
+                               if ( $category != $origcategory )
+                                       if ( array_key_exists( $category, $categories ) )
+                                               continue;
                                $text = $wgContLang->convertHtml( $title->getText() );
                                $this->mCategoryLinks[$type][] = $sk->makeLinkObj( $title, $text );
                        }
@@ -383,6 +431,7 @@ class OutputPage {
        public function disallowUserJs() { $this->mAllowUserJs = false; }
        public function isUserJsAllowed() { return $this->mAllowUserJs; }
 
+       public function prependHTML( $text ) { $this->mBodytext = $text . $this->mBodytext; }
        public function addHTML( $text ) { $this->mBodytext .= $text; }
        public function clearHTML() { $this->mBodytext = ''; }
        public function getHTML() { return $this->mBodytext; }
@@ -411,6 +460,10 @@ class OutputPage {
                $val = is_null( $revid ) ? null : intval( $revid );
                return wfSetVar( $this->mRevisionId, $val );
        }
+       
+       public function getRevisionId() {
+               return $this->mRevisionId;
+       }
 
        /**
         * Convert wikitext to HTML and add it to the buffer
@@ -483,11 +536,18 @@ class OutputPage {
                $this->mNoGallery = $parserOutput->getNoGallery();
                $this->mHeadItems = array_merge( $this->mHeadItems, (array)$parserOutput->mHeadItems );
                // Versioning...
-               $this->mTemplateIds = wfArrayMerge( $this->mTemplateIds, (array)$parserOutput->mTemplateIds );
-
-               // Display title
+               foreach ( (array)$parserOutput->mTemplateIds as $ns => $dbks ) {
+                       if ( isset( $this->mTemplateIds[$ns] ) ) {
+                               $this->mTemplateIds[$ns] = $dbks + $this->mTemplateIds[$ns];
+                       } else {
+                               $this->mTemplateIds[$ns] = $dbks;
+                       }
+               }
+               // Page title
                if( ( $dt = $parserOutput->getDisplayTitle() ) !== false )
                        $this->setPageTitle( $dt );
+               else if ( ( $title = $parserOutput->getTitleText() ) != '' )
+                       $this->setPageTitle( $title );
 
                // Hooks registered in the object
                global $wgParserOutputHooks;
@@ -578,6 +638,9 @@ class OutputPage {
         */
        public function parse( $text, $linestart = true, $interface = false ) {
                global $wgParser, $wgTitle;
+               if( is_null( $wgTitle ) ) {
+                       throw new MWException( 'Empty $wgTitle in ' . __METHOD__ );
+               }
                $popts = $this->parserOptions();
                if ( $interface) { $popts->setInterfaceMessage(true); }
                $parserOutput = $wgParser->parse( $text, $wgTitle, $popts,
@@ -586,6 +649,18 @@ class OutputPage {
                return $parserOutput->getText();
        }
 
+       /** Parse wikitext, strip paragraphs, and return the HTML. */
+       public function parseInline( $text, $linestart = true, $interface = false ) {
+               $parsed = $this->parse( $text, $linestart, $interface );
+
+               $m = array();
+               if ( preg_match( '/^<p>(.*)\n?<\/p>\n?/sU', $parsed, $m ) ) {
+                       $parsed = $m[1];
+               }
+
+               return $parsed;
+       }
+
        /**
         * @param Article $article
         * @param User    $user
@@ -646,7 +721,7 @@ class OutputPage {
         * If it does, it's very important that we don't allow public caching
         */
        function haveCacheVaryCookies() {
-               global $wgRequest, $wgCookiePrefix;
+               global $wgRequest;
                $cookieHeader = $wgRequest->getHeader( 'cookie' );
                if ( $cookieHeader === false ) {
                        return false;
@@ -665,7 +740,6 @@ class OutputPage {
 
        /** Get a complete X-Vary-Options header */
        public function getXVO() {
-               global $wgCookiePrefix;
                $cvCookies = $this->getCacheVaryCookies();
                $xvo = 'X-Vary-Options: Accept-Encoding;list-contains=gzip,Cookie;';
                $first = true;
@@ -724,7 +798,9 @@ class OutputPage {
                                $response->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' );
                                $response->header( "Cache-Control: private, must-revalidate, max-age=0" );
                        }
-                       if($this->mLastModified) $response->header( "Last-modified: {$this->mLastModified}" );
+                       if($this->mLastModified) {
+                               $response->header( "Last-Modified: {$this->mLastModified}" );
+                       }
                } else {
                        wfDebug( __METHOD__ . ": no caching **\n", false );
 
@@ -743,8 +819,9 @@ class OutputPage {
        public function output() {
                global $wgUser, $wgOutputEncoding, $wgRequest;
                global $wgContLanguageCode, $wgDebugRedirects, $wgMimeType;
-               global $wgJsMimeType, $wgUseAjax, $wgAjaxSearch, $wgAjaxWatch;
-               global $wgEnableMWSuggest;
+               global $wgJsMimeType, $wgUseAjax, $wgAjaxWatch;
+               global $wgEnableMWSuggest, $wgUniversalEditButton;
+               global $wgArticle, $wgTitle;
 
                if( $this->mDoNothing ){
                        return;
@@ -838,11 +915,6 @@ class OutputPage {
 
                        wfRunHooks( 'AjaxAddScript', array( &$this ) );
 
-                       if( $wgAjaxSearch && $wgUser->getBoolOption( 'ajaxsearch' ) ) {
-                               $this->addScriptFile( 'ajaxsearch.js' );
-                               $this->addScript( "<script type=\"{$wgJsMimeType}\">hookEvent(\"load\", sajax_onload);</script>\n" );
-                       }
-
                        if( $wgAjaxWatch && $wgUser->isLoggedIn() ) {
                                $this->addScriptFile( 'ajaxwatch.js' );
                        }
@@ -856,6 +928,25 @@ class OutputPage {
                        $this->addScriptFile( 'rightclickedit.js' );
                }
 
+               if( $wgUniversalEditButton ) {
+                       if( isset( $wgArticle ) && isset( $wgTitle ) && $wgTitle->quickUserCan( 'edit' )
+                               && ( $wgTitle->exists() || $wgTitle->quickUserCan( 'create' ) ) ) {
+                               // Original UniversalEditButton
+                               $this->addLink( array(
+                                       'rel' => 'alternate',
+                                       'type' => 'application/x-wiki',
+                                       'title' => wfMsg( 'edit' ),
+                                       'href' => $wgTitle->getFullURL( 'action=edit' )
+                               ) );
+                               // Alternate edit link
+                               $this->addLink( array(
+                                       'rel' => 'edit',
+                                       'title' => wfMsg( 'edit' ),
+                                       'href' => $wgTitle->getFullURL( 'action=edit' )
+                               ) );
+                       }
+               }
+               
                # Buffer output; final headers may depend on later processing
                ob_start();
 
@@ -1005,7 +1096,7 @@ class OutputPage {
 
                array_unshift( $params, 'parse' );
                array_unshift( $params, $msg );
-               $this->addHtml( call_user_func_array( 'wfMsgExt', $params ) );
+               $this->addHTML( call_user_func_array( 'wfMsgExt', $params ) );
 
                $this->returnToMain();
        }
@@ -1060,7 +1151,7 @@ class OutputPage {
         * @param string $permission key required
         */
        public function permissionRequired( $permission ) {
-               global $wgGroupPermissions, $wgUser;
+               global $wgUser;
 
                $this->setPageTitle( wfMsg( 'badaccess' ) );
                $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
@@ -1068,25 +1159,15 @@ class OutputPage {
                $this->setArticleRelated( false );
                $this->mBodytext = '';
 
-               $groups = array();
-               foreach( User::getGroupsWithPermission( $permission ) as $key ) {
-                       $groupName = User::getGroupName( $key );
-                       $groupPage = User::getGroupPage( $key );
-                       if( $groupPage ) {
-                               $skin = $wgUser->getSkin();
-                               $groups[] = $skin->makeLinkObj( $groupPage, $groupName );
-                       } else {
-                               $groups[] = $groupName;
-                       }
-               }
-               $n = count( $groups );
-               if ( $count > 0 ) {
-                       $message = wfMsgHtml( 'badaccess-groups', array( $groups, $n ) );
-               }
-               else {
-                       $message = wfMsgHtml( "badaccess-group0", $groups );
+               $groups = array_map( array( 'User', 'makeGroupLinkWiki' ),
+                       User::getGroupsWithPermission( $permission ) );
+               if( $groups ) {
+                       $this->addWikiMsg( 'badaccess-groups',
+                               implode( ', ', $groups ),
+                               count( $groups) );
+               } else {
+                       $this->addWikiMsg( 'badaccess-group0' );
                }
-               $this->addHtml( $message );
                $this->returnToMain();
        }
 
@@ -1126,8 +1207,8 @@ class OutputPage {
 
                $loginTitle = SpecialPage::getTitleFor( 'Userlogin' );
                $loginLink = $skin->makeKnownLinkObj( $loginTitle, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $wgTitle->getPrefixedUrl() );
-               $this->addHtml( wfMsgWikiHtml( 'loginreqpagetext', $loginLink ) );
-               $this->addHtml( "\n<!--" . $wgTitle->getPrefixedUrl() . "-->" );
+               $this->addHTML( wfMsgWikiHtml( 'loginreqpagetext', $loginLink ) );
+               $this->addHTML( "\n<!--" . $wgTitle->getPrefixedUrl() . "-->" );
 
                # Don't return to the main page if the user can't read it
                # otherwise we'll end up in a pointless loop
@@ -1149,8 +1230,8 @@ class OutputPage {
                if ($action == null) {
                        $text = wfMsgNoTrans( 'permissionserrorstext', count($errors)). "\n\n";
                } else {
-                       $action_desc = wfMsg( "right-$action" );
-                       $action_desc[0] = strtolower($action_desc[0]);
+                       global $wgLang;
+                       $action_desc = wfMsg( "action-$action" );
                        $text = wfMsgNoTrans( 'permissionserrorstext-withaction', count($errors), $action_desc ) . "\n\n";
                }
 
@@ -1216,7 +1297,7 @@ class OutputPage {
                        // Wiki is read only
                        $this->setPageTitle( wfMsg( 'readonly' ) );
                        $reason = wfReadOnlyReason();
-                       $this->addWikiMsg( 'readonlytext', $reason );
+                       $this->wrapWikiMsg( '<div class="mw-readonly-error">$1</div>', array( 'readonlytext', $reason ) );
                }
 
                // Show source, if supplied
@@ -1235,7 +1316,10 @@ class OutputPage {
                        // Show templates used by this article
                        $skin = $wgUser->getSkin();
                        $article = new Article( $wgTitle );
-                       $this->addHTML( $skin->formatTemplates( $article->getUsedTemplates() ) );
+                       $this->addHTML( "<div class='templatesUsed'>
+{$skin->formatTemplates( $article->getUsedTemplates() )}
+</div>
+" );
                }
 
                # If the title doesn't exist, it's fairly pointless to print a return
@@ -1318,8 +1402,9 @@ class OutputPage {
         */
        public function addReturnTo( $title ) {
                global $wgUser;
+               $this->addLink( array( 'rel' => 'next', 'href' => $title->getFullUrl() ) );
                $link = wfMsg( 'returnto', $wgUser->getSkin()->makeLinkObj( $title ) );
-               $this->addHtml( "<p>{$link}</p>\n" );
+               $this->addHTML( "<p>{$link}</p>\n" );
        }
 
        /**
@@ -1379,15 +1464,19 @@ class OutputPage {
        /**
         * @return string The doctype, opening <html>, and head element.
         */
-       public function headElement() {
+       public function headElement( Skin $sk ) {
                global $wgDocType, $wgDTD, $wgContLanguageCode, $wgOutputEncoding, $wgMimeType;
                global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
                global $wgUser, $wgContLang, $wgUseTrackbacks, $wgTitle, $wgStyleVersion;
 
+               $this->addMeta( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" );
+               $this->addStyle( 'common/wikiprintable.css', 'print' );
+               $sk->setupUserCss( $this );
+
+               $ret = '';
+
                if( $wgMimeType == 'text/xml' || $wgMimeType == 'application/xhtml+xml' || $wgMimeType == 'application/xml' ) {
-                       $ret = "<?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?>\n";
-               } else {
-                       $ret = '';
+                       $ret .= "<?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?>\n";
                }
 
                $ret .= "<!DOCTYPE html PUBLIC \"$wgDocType\"\n        \"$wgDTD\">\n";
@@ -1402,24 +1491,17 @@ class OutputPage {
                        $ret .= "xmlns:{$tag}=\"{$ns}\" ";
                }
                $ret .= "xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" $rtl>\n";
-               $ret .= "<head>\n<title>" . htmlspecialchars( $this->getHTMLTitle() ) . "</title>\n";
-               $this->addMeta( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" );
-               
-               $ret .= $this->getHeadLinks();
-               global $wgStylePath;
-               if( $this->isPrintable() ) {
-                       $media = '';
-               } else {
-                       $media = "media='print'";
+               $ret .= "<head>\n<title>" . htmlspecialchars( $this->getHTMLTitle() ) . "</title>\n\t\t";
+               $ret .= implode( "\t\t", array(
+                       $this->getHeadLinks(),
+                       $this->buildCssLinks(),
+                       $sk->getHeadScripts( $this->mAllowUserJs ),
+                       $this->mScripts,
+                       $this->getHeadItems(),
+               ));
+               if( $sk->usercss ){
+                       $ret .= "<style type='text/css'>{$sk->usercss}</style>";
                }
-               $printsheet = htmlspecialchars( "$wgStylePath/common/wikiprintable.css?$wgStyleVersion" );
-               $ret .= "<link rel='stylesheet' type='text/css' $media href='$printsheet' />\n";
-
-               $sk = $wgUser->getSkin();
-               $ret .= $sk->getHeadScripts( $this->mAllowUserJs );
-               $ret .= $this->mScripts;
-               $ret .= $sk->getUserStyles();
-               $ret .= $this->getHeadItems();
 
                if ($wgUseTrackbacks && $this->isArticleRelated())
                        $ret .= $wgTitle->trackbackRDF();
@@ -1430,7 +1512,8 @@ class OutputPage {
        
        protected function addDefaultMeta() {
                global $wgVersion;
-               $this->addMeta( "generator", "MediaWiki $wgVersion" );
+               $this->addMeta( 'http:Content-Style-Type', 'text/css' ); //bug 15835
+               $this->addMeta( 'generator', "MediaWiki $wgVersion" );
                
                $p = "{$this->mIndexPolicy},{$this->mFollowPolicy}";
                if( $p !== 'index,follow' ) {
@@ -1492,20 +1575,29 @@ class OutputPage {
                        # Recent changes feed should appear on every page (except recentchanges, 
                        # that would be redundant). Put it after the per-page feed to avoid 
                        # changing existing behavior. It's still available, probably via a 
-                       # menu in your browser.
-
+                       # menu in your browser. Some sites might have a different feed they'd
+                       # like to promote instead of the RC feed (maybe like a "Recent New Articles"
+                       # or "Breaking news" one). For this, we see if $wgOverrideSiteFeed is defined.
+                       # If so, use it instead.
+                       
+                       global $wgOverrideSiteFeed, $wgSitename, $wgFeedClasses;
                        $rctitle = SpecialPage::getTitleFor( 'Recentchanges' );
-                       if ( $wgTitle->getPrefixedText() != $rctitle->getPrefixedText() ) {
-                               global $wgSitename;
-                               
-                               $tags[] = $this->feedLink(
-                                       'rss',
-                                       $rctitle->getFullURL( 'feed=rss' ),
-                                       wfMsg( 'site-rss-feed', $wgSitename ) );
-                               $tags[] = $this->feedLink(
-                                       'atom',
-                                       $rctitle->getFullURL( 'feed=atom' ),
-                                       wfMsg( 'site-atom-feed', $wgSitename ) );
+                       
+                       if ( $wgOverrideSiteFeed ) {
+                               foreach ( $wgOverrideSiteFeed as $type => $feedUrl ) { 
+                                       $tags[] = $this->feedLink (
+                                               $type,
+                                               htmlspecialchars( $feedUrl ),
+                                               wfMsg( "site-{$type}-feed", $wgSitename ) );
+                               }
+                       }
+                       else if ( $wgTitle->getPrefixedText() != $rctitle->getPrefixedText() ) {
+                               foreach( $wgFeedClasses as $format => $class ) {
+                                       $tags[] = $this->feedLink(
+                                               $format,
+                                               $rctitle->getFullURL( "feed={$format}" ),
+                                               wfMsg( "site-{$format}-feed", $wgSitename ) ); # For grep: 'site-rss-feed', 'site-atom-feed'.
+                               }
                        }
                }
 
@@ -1545,6 +1637,118 @@ class OutputPage {
                        'href' => $url ) );
        }
 
+       /**
+        * Add a local or specified stylesheet, with the given media options.
+        * Meant primarily for internal use...
+        *
+        * @param $media -- to specify a media type, 'screen', 'printable', 'handheld' or any.
+        * @param $conditional -- for IE conditional comments, specifying an IE version
+        * @param $dir -- set to 'rtl' or 'ltr' for direction-specific sheets
+        */
+       public function addStyle( $style, $media='', $condition='', $dir='' ) {
+               $options = array();
+               if( $media )
+                       $options['media'] = $media;
+               if( $condition )
+                       $options['condition'] = $condition;
+               if( $dir )
+                       $options['dir'] = $dir;
+               $this->styles[$style] = $options;
+       }
+
+       /**
+        * Build a set of <link>s for the stylesheets specified in the $this->styles array.
+        * These will be applied to various media & IE conditionals.
+        */
+       public function buildCssLinks() {
+               $links = array();
+               foreach( $this->styles as $file => $options ) {
+                       $link = $this->styleLink( $file, $options );
+                       if( $link )
+                               $links[] = $link;
+               }
+
+               return implode( "\n\t\t", $links );
+       }
+
+       protected function styleLink( $style, $options ) {
+               global $wgRequest;
+
+               if( isset( $options['dir'] ) ) {
+                       global $wgContLang;
+                       $siteDir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
+                       if( $siteDir != $options['dir'] )
+                               return '';
+               }
+
+               if( isset( $options['media'] ) ) {
+                       $media = $this->transformCssMedia( $options['media'] );
+                       if( is_null( $media ) ) {
+                               return '';
+                       }
+               } else {
+                       $media = '';
+               }
+
+               if( substr( $style, 0, 1 ) == '/' ||
+                       substr( $style, 0, 5 ) == 'http:' ||
+                       substr( $style, 0, 6 ) == 'https:' ) {
+                       $url = $style;
+               } else {
+                       global $wgStylePath, $wgStyleVersion;
+                       $url = $wgStylePath . '/' . $style . '?' . $wgStyleVersion;
+               }
+
+               $attribs = array(
+                       'rel' => 'stylesheet',
+                       'href' => $url,
+                       'type' => 'text/css' );
+               if( $media ) {
+                       $attribs['media'] = $media;
+               }
+
+               $link = Xml::element( 'link', $attribs );
+
+               if( isset( $options['condition'] ) ) {
+                       $condition = htmlspecialchars( $options['condition'] );
+                       $link = "<!--[if $condition]>$link<![endif]-->";
+               }
+               return $link;
+       }
+
+       function transformCssMedia( $media ) {
+               global $wgRequest, $wgHandheldForIPhone;
+
+               // Switch in on-screen display for media testing
+               $switches = array(
+                       'printable' => 'print',
+                       'handheld' => 'handheld',
+               );
+               foreach( $switches as $switch => $targetMedia ) {
+                       if( $wgRequest->getBool( $switch ) ) {
+                               if( $media == $targetMedia ) {
+                                       $media = '';
+                               } elseif( $media == 'screen' ) {
+                                       return null;
+                               }
+                       }
+               }
+
+               // Expand longer media queries as iPhone doesn't grok 'handheld'
+               if( $wgHandheldForIPhone ) {
+                       $mediaAliases = array(
+                               'screen' => 'screen and (min-device-width: 481px)',
+                               'handheld' => 'handheld, only screen and (max-device-width: 480px)',
+                       );
+
+                       if( isset( $mediaAliases[$media] ) ) {
+                               $media = $mediaAliases[$media];
+                       }
+               }
+
+               return $media;
+       }
+
        /**
         * Turn off regular page output and return an error reponse
         * for when rate limiting has triggered.
@@ -1589,7 +1793,7 @@ class OutputPage {
                                ? 'lag-warn-normal'
                                : 'lag-warn-high';
                        $warning = wfMsgExt( $message, 'parse', $lag );
-                       $this->addHtml( "<div class=\"mw-{$message}\">\n{$warning}\n</div>\n" );
+                       $this->addHTML( "<div class=\"mw-{$message}\">\n{$warning}\n</div>\n" );
                }
        }
 
@@ -1658,7 +1862,7 @@ class OutputPage {
                                $args = array();
                                $name = $spec;
                        }
-                       $s = str_replace( '$' . ($n+1), wfMsgExt( $name, $options, $args ), $s );
+                       $s = str_replace( '$' . ( $n + 1 ), wfMsgExt( $name, $options, $args ), $s );
                }
                $this->addHTML( $this->parse( $s, /*linestart*/true, /*uilang*/true ) );
        }