Localisation updates from Betawiki.

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

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 82e19d5..25385f0 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -63,6 +63,10 @@ class OutputPage {
                $this->mRedirect = str_replace( "\n", '', $url );
                $this->mRedirectCode = $responsecode;
        }
+       
+       public function getRedirect() {
+               return $this->mRedirect;
+       }
 
        /**
         * Set the HTTP status code to send with the output.
@@ -760,6 +764,9 @@ class OutputPage {
 
                $name = User::whoIs( $wgUser->blockedBy() );
                $reason = $wgUser->blockedFor();
+               if( $reason == '' ) {
+                       $reason = wfMsg( 'blockednoreason' );
+               }
                $blockTimestamp = $wgLang->timeanddate( wfTimestamp( TS_MW, $wgUser->mBlock->mTimestamp ), true );
                $ip = wfGetIP();
 
@@ -1028,7 +1035,7 @@ class OutputPage {
                                        $titles = '';
                                        foreach( $cascadeSources as $title )
                                                $titles .= "* [[:" . $title->getPrefixedText()  . "]]\n";
-                                       $this->addWikiText( wfMsgExt( 'cascadeprotected', 'parsemag', $count ) . "\n{$titles}" );
+                                       $this->addWikiText( wfMsgExt( 'cascadeprotected', 'parsemag', $count, "\n{$titles}" ) );
                        } elseif( !$wgTitle->isProtected( 'edit' ) && $wgTitle->isNamespaceProtected() ) {
                                // Namespace protection
                                $ns = $wgTitle->getNamespace() == NS_MAIN
@@ -1278,16 +1285,6 @@ class OutputPage {
                        $ret .= " />\n";
                }
                
-               # Recent changes feed should appear on every page
-               global $wgSitename;
-               $rctitle = SpecialPage::getTitleFor( 'Recentchanges' );
-               $link = $rctitle->escapeFullURL( 'feed=rss' );
-               $title = Sanitizer::encodeAttribute( wfMsg( 'site-rss-feed', $wgSitename ) );
-               $ret .= "<link rel='alternate' type='application/rss+xml' title='$title' href='$link' />\n";
-               $link = $rctitle->escapeFullURL( 'feed=atom' );
-               $title = Sanitizer::encodeAttribute( wfMsg( 'site-atom-feed', $wgSitename ) );
-               $ret .= "<link rel='alternate' type='application/atom+xml' title='$title' href='$link' />\n";
-
                if( $this->isSyndicated() ) {
                        # FIXME: centralize the mime-type and name information in Feed.php
                        # Use the page name for the title (accessed through $wgTitle since
@@ -1295,17 +1292,43 @@ class OutputPage {
                        # with having the same name for different feeds corresponding to
                        # the same page, but we can't avoid that at this low a level.
                        global $wgTitle;
-                       $pagetitle = $wgTitle->getPrefixedText();
-                       $link = $wgRequest->escapeAppendQuery( 'feed=rss' );
-                       $title = Sanitizer::encodeAttribute( wfMsg( 'page-rss-feed', $pagetitle ) );
-                       $ret .= "<link rel='alternate' type='application/rss+xml' title='$title' href='$link' />\n";
-                       $link = $wgRequest->escapeAppendQuery( 'feed=atom' );
-                       $title = Sanitizer::encodeAttribute( wfMsg( 'page-atom-feed', $pagetitle ) );
-                       $ret .= "<link rel='alternate' type='application/atom+xml' title='$title' href='$link' />\n";
+                       $ret .= $this->feedLink(
+                               'rss',
+                               $wgRequest->appendQuery( 'feed=rss' ),
+                               wfMsg( 'page-rss-feed', $wgTitle->getPrefixedText() ) );
+                       $ret .= $this->feedLink(
+                               'atom',
+                               $wgRequest->appendQuery( 'feed=atom' ),
+                               wfMsg( 'page-atom-feed', $wgTitle->getPrefixedText() ) );
                }
 
+               # Recent changes feed should appear on every page
+               # Put it after the per-page feed to avoid changing existing behavior.
+               # It's still available, probably via a menu in your browser.
+               global $wgSitename;
+               $rctitle = SpecialPage::getTitleFor( 'Recentchanges' );
+               $ret .= $this->feedLink(
+                       'rss',
+                       $rctitle->getFullURL( 'feed=rss' ),
+                       wfMsg( 'site-rss-feed', $wgSitename ) );
+               $ret .= $this->feedLink(
+                       'atom',
+                       $rctitle->getFullURL( 'feed=atom' ),
+                       wfMsg( 'site-atom-feed', $wgSitename ) );
+
                return $ret;
        }
+       
+       /**
+        * Generate a <link rel/> for an RSS feed.
+        */
+       private function feedLink( $type, $url, $text ) {
+               return Xml::element( 'link', array(
+                       'rel' => 'alternate',
+                       'type' => "application/$type+xml",
+                       'title' => $text,
+                       'href' => $url ) ) . "\n";
+       }
 
        /**
         * Turn off regular page output and return an error reponse