With &debugmsg=1, PHP output a warning because the link trail no longer
[lhc/web/wiklou.git] / includes / Skin.php
index 5fb9a13..8e087ce 100644 (file)
@@ -1,18 +1,19 @@
 <?php
-
-require_once( 'Feed.php' );
-require_once( 'Image.php' );
+if( defined( "MEDIAWIKI" ) ) {
 
 # See skin.doc
 
+require_once( 'Feed.php' );  // should not be called if the actual page isn't feed enabled
+require_once( 'Image.php' );
+
 # These are the INTERNAL names, which get mapped
 # directly to class names.  For display purposes, the
 # Language class has internationalized names
 #
 /* private */ $wgValidSkinNames = array(
-       'standard' => 'Standard',
-       'nostalgia' => 'Nostalgia',
-       'cologneblue' => 'CologneBlue'
+       'standard'              => 'Standard',
+       'nostalgia'             => 'Nostalgia',
+       'cologneblue'   => 'CologneBlue'
 );
 if( $wgUsePHPTal ) {
     #$wgValidSkinNames[] = 'PHPTal';
@@ -28,7 +29,7 @@ require_once( 'RecentChange.php' );
 class RCCacheEntry extends RecentChange
 {
        var $secureName, $link;
-       var $curlink , $lastlink , $usertalklink , $versionlink ;
+       var $curlink , $difflink, $lastlink , $usertalklink , $versionlink ;
        var $userlink, $timestamp, $watched;
 
        function newFromParent( $rc )
@@ -47,6 +48,7 @@ class Skin {
        var $rc_cache ; # Cache for Enhanced Recent Changes
        var $rcCacheIndex ; # Recent Changes Cache Counter for visibility toggle
        var $rcMoveIndex;
+       var $postParseLinkColour = true;
 
        function Skin()
        {
@@ -67,6 +69,11 @@ class Skin {
                return "standard";
        }
 
+       # Get/set accessor for delayed link colouring
+       function postParseLinkColour( $setting = NULL ) {
+               return wfSetVar( $this->postParseLinkColour, $setting );
+       }
+
        function qbSetting()
        {
                global $wgOut, $wgUser;
@@ -81,14 +88,14 @@ class Skin {
        {
                $fname = 'Skin::initPage';
                wfProfileIn( $fname );
-               
+
                $out->addLink( array( 'rel' => 'shortcut icon', 'href' => '/favicon.ico' ) );
-               
+
                $this->addMetadataLinks($out);
-           
+
                wfProfileOut( $fname );
        }
-       
+
        function addMetadataLinks( &$out ) {
                global $wgTitle, $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf, $wgRdfMimeType, $action;
                global $wgRightsPage, $wgRightsUrl;
@@ -124,10 +131,10 @@ class Skin {
                                'href' => $copyright ) );
                }
        }
-    
+
        function outputPage( &$out ) {
                global $wgDebugComments;
-               
+
                wfProfileIn( 'Skin::outputPage' );
                $this->initPage( $out );
                $out->out( $out->headElement() );
@@ -147,7 +154,7 @@ class Skin {
                $out->out( $out->mBodytext . "\n" );
 
                $out->out( $this->afterContent() );
-               
+
                wfProfileClose();
                $out->out( $out->reportTime() );
 
@@ -155,9 +162,9 @@ class Skin {
        }
 
        function getHeadScripts() {
-               global $wgStylePath, $wgUser, $wgLang;
+               global $wgStylePath, $wgUser, $wgLang, $wgAllowUserJs;
                $r = "<script type=\"text/javascript\" src=\"{$wgStylePath}/wikibits.js\"></script>\n";
-               if( $wgUser->getID() != 0 ) { # logged in       
+               if( $wgAllowUserJs && $wgUser->getID() != 0 ) { # logged in
                        $userpage = $wgLang->getNsText( Namespace::getUser() ) . ":" . $wgUser->getName();
                        $userjs = htmlspecialchars($this->makeUrl($userpage.'/'.$this->getSkinName().'.js', 'action=raw&ctype=text/javascript'));
                        $r .= '<script type="text/javascript" src="'.$userjs."\"></script>\n";
@@ -167,27 +174,27 @@ class Skin {
 
        # get the user/site-specific stylesheet, SkinPHPTal called from RawPage.php (settings are cached that way)
        function getUserStylesheet() {
-               global $wgOut, $wgStylePath, $wgLang, $wgUser, $wgRequest, $wgTitle;
+               global $wgOut, $wgStylePath, $wgLang, $wgUser, $wgRequest, $wgTitle, $wgAllowUserCss;
                $sheet = $this->getStylesheet();
                $action = $wgRequest->getText('action');
                $s = "@import \"$wgStylePath/$sheet\";\n";
                if($wgLang->isRTL()) $s .= "@import \"$wgStylePath/common_rtl.css\";\n";
-               if( $wgUser->getID() != 0 ) { # logged in       
+               if( $wgAllowUserCss && $wgUser->getID() != 0 ) { # logged in
                        if($wgTitle->isCssSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {
                                $s .= $wgRequest->getText('wpTextbox1');
                        } else {
                                $userpage = $wgLang->getNsText( Namespace::getUser() ) . ":" . $wgUser->getName();
-                               $s.= '@import "'.$this->makeUrl($userpage.'/'.$this->getSkinName(), 'action=raw&ctype=text/css').'";'."\n";
+                               $s.= '@import "'.$this->makeUrl($userpage.'/'.$this->getSkinName().'.css', 'action=raw&ctype=text/css').'";'."\n";
                        }
                }
                $s .= $this->doGetUserStyles();
-               return $s."\n"; 
+               return $s."\n";
        }
        # placeholder, returns generated js in monobook
        function getUserJs() {
                return;
        }
-       
+
        function getUserStyles()
        {
                global $wgOut, $wgStylePath, $wgLang;
@@ -201,16 +208,17 @@ class Skin {
 
        function doGetUserStyles()
        {
-               global $wgUser;
+               global $wgUser, $wgLang;
+
+               $csspage = $wgLang->getNsText( NS_MEDIAWIKI ) . ":" . $this->getSkinName() . ".css";
+               $s = '@import "'.$this->makeUrl($csspage, 'action=raw&ctype=text/css')."\";\n";
 
-               $s = '';
                if ( 1 == $wgUser->getOption( 'underline' ) ) {
                        # Don't override browser settings
                } else {
                        # CHECK MERGE @@@
                        # Force no underline
-                       $s .= 'a { ' .
-                         "text-decoration: none; }\n";
+                       $s .= "a { text-decoration: none; }\n";
                }
                if ( 1 == $wgUser->getOption( 'highlightbroken' ) ) {
                        $s .= "a.new, #quickbar a.new { color: #CC2200; }\n";
@@ -224,19 +232,19 @@ class Skin {
        function getBodyOptions()
        {
                global $wgUser, $wgTitle, $wgNamespaceBackgrounds, $wgOut, $wgRequest;
-               
+
                extract( $wgRequest->getValues( 'oldid', 'redirect', 'diff' ) );
 
                if ( 0 != $wgTitle->getNamespace() ) {
                        $a = array( 'bgcolor' => '#ffffec' );
                }
                else $a = array( 'bgcolor' => '#FFFFFF' );
-               if($wgOut->isArticle() && $wgUser->getOption('editondblclick') && 
+               if($wgOut->isArticle() && $wgUser->getOption('editondblclick') &&
                  (!$wgTitle->isProtected() || $wgUser->isSysop()) ) {
                        $t = wfMsg( 'editthispage' );
                        $oid = $red = '';
-                       if ( !empty($redirect) ) { 
-                               $red = "&redirect={$redirect}"; 
+                       if ( !empty($redirect) ) {
+                               $red = "&redirect={$redirect}";
                        }
                        if ( !empty($oldid) && ! isset( $diff ) ) {
                                $oid = "&oldid={$oldid}";
@@ -275,12 +283,12 @@ class Skin {
                $link = str_replace( '_', ' ', $link );
                $link = wfEscapeHTML( $link );
 
-               if ( $broken == 'stub' ) { 
-                       $r = ' class="stub"'; 
-               } else if ( $broken == 'yes' ) { 
-                       $r = ' class="new"'; 
-               } else { 
-                       $r = ''; 
+               if ( $broken == 'stub' ) {
+                       $r = ' class="stub"';
+               } else if ( $broken == 'yes' ) {
+                       $r = ' class="new"';
+               } else {
+                       $r = '';
                }
 
                if ( 1 == $wgUser->getOption( 'hover' ) ) {
@@ -288,25 +296,25 @@ class Skin {
                }
                return $r;
        }
-       
+
        function getInternalLinkAttributesObj( &$nt, $text, $broken = false )
        {
                global $wgUser, $wgOut;
 
-               if ( $broken == 'stub' ) { 
-                       $r = ' class="stub"'; 
-               } else if ( $broken == 'yes' ) { 
-                       $r = ' class="new"'; 
-               } else { 
-                       $r = ''; 
+               if ( $broken == 'stub' ) {
+                       $r = ' class="stub"';
+               } else if ( $broken == 'yes' ) {
+                       $r = ' class="new"';
+               } else {
+                       $r = '';
                }
 
                if ( 1 == $wgUser->getOption( 'hover' ) ) {
                        $r .= ' title ="' . $nt->getEscapedText() . '"';
                }
                return $r;
-       }               
-       
+       }
+
        function getLogo()
        {
                global $wgLogo;
@@ -318,19 +326,14 @@ class Skin {
        #
        function beforeContent()
        {
-               global $wgUser, $wgOut, $wgSiteNotice;
+               global $wgUser, $wgOut;
 
-               if( $wgSiteNotice ) {
-                       $note = "\n<div id='siteNotice'>$wgSiteNotice</div>\n";
-               } else {
-                       $note = '';
-               }
-               return $this->doBeforeContent() . $note;
+               return $this->doBeforeContent();
        }
 
        function doBeforeContent()
        {
-               global $wgUser, $wgOut, $wgTitle, $wgLang;
+               global $wgUser, $wgOut, $wgTitle, $wgLang, $wgSiteNotice;
                $fname = 'Skin::doBeforeContent';
                wfProfileIn( $fname );
 
@@ -352,7 +355,7 @@ class Skin {
                $shove = ($qb != 0);
                $left = ($qb == 1 || $qb == 3);
                if($wgLang->isRTL()) $left = !$left;
-               
+
                if ( !$shove ) {
                        $s .= "<td class='top' align='left' valign='top' rowspan='{$rows}'>\n" .
                          $this->logoText() . '</td>';
@@ -380,34 +383,40 @@ class Skin {
                $s .= "</tr>\n</table>\n</div>\n";
                $s .= "\n<div id='article'>\n";
 
+               if( $wgSiteNotice ) {
+                       $s .= "\n<div id='siteNotice'>$wgSiteNotice</div>\n";
+               }
                $s .= $this->pageTitle();
                $s .= $this->pageSubtitle() ;
                $s .= $this->getCategories();
                wfProfileOut( $fname );
                return $s;
        }
-       
+
        function getCategoryLinks () {
                global $wgOut, $wgTitle, $wgUser, $wgParser;
                global $wgUseCategoryMagic, $wgUseCategoryBrowser, $wgLang;
+
                if( !$wgUseCategoryMagic ) return '' ;
                if( count( $wgOut->mCategoryLinks ) == 0 ) return '';
-               if( !$wgOut->isArticle() ) return '';
-               
+
+               # Taken out so that they will be displayed in previews -- TS
+               #if( !$wgOut->isArticle() ) return '';
+
                $t = implode ( ' | ' , $wgOut->mCategoryLinks ) ;
                $s = $this->makeKnownLink( 'Special:Categories',
                        wfMsg( 'categories' ), 'article=' . urlencode( $wgTitle->getPrefixedDBkey() ) )
                        . ': ' . $t;
-               
+
                if($wgUseCategoryBrowser) {
                        $s .= '<br/><hr/>';
                        $catstack = array();
                        $s.= $wgTitle->getAllParentCategories($catstack);
                }
-               
+
                return $s;
        }
-       
+
        function getCategories() {
                $catlinks=$this->getCategoryLinks();
                if(!empty($catlinks)) {
@@ -426,18 +435,22 @@ class Skin {
        {
                global $wgUser, $wgOut, $wgServer;
                global $wgTitle, $wgLang;
-               
+
                $printfooter = "<div class=\"printfooter\">\n" . $this->printFooter() . "</div>\n";
                return $printfooter . $this->doAfterContent();
        }
-       
-       function printFooter() {
+
+       function printSource() {
                global $wgTitle;
                $url = htmlspecialchars( $wgTitle->getFullURL() );
-               return "<p>" . wfMsg( "retrievedfrom", "<a href=\"$url\">$url</a>" ) .
+               return wfMsg( "retrievedfrom", "<a href=\"$url\">$url</a>" );
+       }
+
+       function printFooter() {
+               return "<p>" .  $this->printSource() .
                        "</p>\n\n<p>" . $this->pageStats() . "</p>\n";
        }
-       
+
        function doAfterContent()
        {
                global $wgUser, $wgOut, $wgLang;
@@ -448,7 +461,7 @@ class Skin {
                $s = "\n</div><br style=\"clear:both\" />\n";
                $s .= "\n<div id='footer'>";
                $s .= '<table border="0" cellspacing="0"><tr>';
-               
+
                wfProfileOut( $fname.'-1' );
                wfProfileIn( $fname.'-2' );
 
@@ -477,7 +490,7 @@ class Skin {
                        $s .= $this->getQuickbarCompensator();
                }
                $s .= "</tr></table>\n</div>\n</div>\n";
-               
+
                wfProfileOut( $fname.'-3' );
                wfProfileIn( $fname.'-4' );
                if ( 0 != $qb ) { $s .= $this->quickBar(); }
@@ -507,12 +520,12 @@ class Skin {
                        if ( isset ( $wgUseApproval ) && $wgUseApproval )
                        {
                                $t = $wgTitle->getDBkey();
-                               $name = 'Approve this article' ; 
+                               $name = 'Approve this article' ;
                                $link = "http://test.wikipedia.org/w/magnus/wiki.phtml?title={$t}&action=submit&doit=1" ;
                                #wfEscapeHTML( wfImageUrl( $name ) );
                                $style = $this->getExternalLinkAttributes( $link, $name );
                                $s .= " | <a href=\"{$link}\"{$style}>{$name}</a>" ;
-                       }               
+                       }
                }
                if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
                        $s .= ' | ' . $this->makeKnownLink( $wgTitle->getPrefixedText(),
@@ -520,8 +533,8 @@ class Skin {
                }
 
                if ( $wgUser->getNewtalk() ) {
-               # do not show "You have new messages" text when we are viewing our 
-               # own talk page 
+               # do not show "You have new messages" text when we are viewing our
+               # own talk page
 
                        if(!(strcmp($wgTitle->getText(),$wgUser->getName()) == 0 &&
                                                $wgTitle->getNamespace()==Namespace::getTalk(Namespace::getUser()))) {
@@ -532,7 +545,7 @@ class Skin {
                                $s.= ' | <strong>'. wfMsg( 'newmessages', $tl ) . '</strong>';
                        }
                }
-               
+
                $undelete = $this->getUndeleteLink();
                if( !empty( $undelete ) ) {
                        $s .= ' | '.$undelete;
@@ -552,7 +565,7 @@ class Skin {
                }
                return '';
        }
-       
+
        function printableLink()
        {
                global $wgOut, $wgFeedClasses, $wgRequest;
@@ -565,7 +578,7 @@ class Skin {
                }
                $baseurl = htmlspecialchars( $baseurl );
                $printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
-               
+
                $s = "<a href=\"$printurl\">" . wfMsg( 'printableversion' ) . '</a>';
                if( $wgOut->isSyndicated() ) {
                        foreach( $wgFeedClasses as $format => $class ) {
@@ -645,17 +658,17 @@ class Skin {
                                $tl = $this->makeKnownLink( $wgLang->getNsText(
                                  Namespace::getTalk( Namespace::getUser() ) ) . ":{$n}",
                                  $wgLang->getNsText( Namespace::getTalk( 0 ) ) );
-                         
+
                                $s .= $n . ' ('.$tl.')';
                        } else {
                                $s .= wfMsg('notloggedin');
                        }
-                       
+
                        $rt = $wgTitle->getPrefixedURL();
                        if ( 0 == strcasecmp( urlencode( $lo ), $rt ) ) {
                                $q = '';
                        } else { $q = "returnto={$rt}"; }
-                       
+
                        $s .= "\n<br />" . $this->makeKnownLink( $li,
                          wfMsg( 'login' ), $q );
                } else {
@@ -665,8 +678,8 @@ class Skin {
                          Namespace::getTalk( Namespace::getUser() ) ) . ":{$n}",
                          $wgLang->getNsText( Namespace::getTalk( 0 ) ) );
 
-                       $tl = " ({$tl})"; 
-                       
+                       $tl = " ({$tl})";
+
                        $s .= $this->makeKnownLink( $wgLang->getNsText(
                          Namespace::getUser() ) . ":{$n}", $n ) . "{$tl}<br />" .
                          $this->makeKnownLink( $lo, wfMsg( 'logout' ),
@@ -674,25 +687,25 @@ class Skin {
                          $this->specialLink( 'preferences' );
                }
                $s .= ' | ' . $this->makeKnownLink( wfMsg( 'helppage' ),
-                 wfMsg( 'help' ) ); 
+                 wfMsg( 'help' ) );
 
                return $s;
        }
-       
+
        function getSearchLink() {
                $searchPage =& Title::makeTitle( NS_SPECIAL, 'Search' );
                return $searchPage->getLocalURL();
        }
-       
+
        function escapeSearchLink() {
                return htmlspecialchars( $this->getSearchLink() );
        }
-       
+
        function searchForm()
        {
                global $wgRequest;
                $search = $wgRequest->getText( 'search' );
-               
+
                $s = '<form name="search" class="inline" method="post" action="'
                  . $this->escapeSearchLink() . "\">\n"
                  . '<input type="text" name="search" size="19" value="'
@@ -722,7 +735,7 @@ class Skin {
        }
 
        function bottomLinks()
-       { 
+       {
                global $wgOut, $wgUser, $wgTitle;
                $sep = " |\n";
 
@@ -739,11 +752,11 @@ class Skin {
 
                        if ( $wgTitle->getNamespace() == Namespace::getUser()
                            || $wgTitle->getNamespace() == Namespace::getTalk(Namespace::getUser()) )
-                           
+
                        {
                                $id=User::idFromName($wgTitle->getText());
                                $ip=User::isIP($wgTitle->getText());
-                               
+
                                if($id || $ip) { # both anons and non-anons have contri list
                                        $s .= $sep . $this->userContribsLink();
                                }
@@ -766,7 +779,7 @@ class Skin {
        function pageStats()
        {
                global $wgOut, $wgLang, $wgArticle, $wgRequest;
-               global $wgDisableCounters;
+               global $wgDisableCounters, $wgMaxCredits, $wgShowCreditsIfMax;
 
                extract( $wgRequest->getValues( 'oldid', 'diff' ) );
                if ( ! $wgOut->isArticle() ) { return ''; }
@@ -781,96 +794,29 @@ class Skin {
                        }
                }
 
-               $s .= ' ' . $this->getCredits();
-           
-               return $s . ' ' .  $this->getCopyright();
-       }
-
-        function getCredits() {
-              global $wgMaxCredits;
-              
-              $s = '';
-           
-              if (!isset($wgMaxCredits) || $wgMaxCredits == 0) {
-                       $s = $this->lastModified();
-              } else {
-                       $s = $this->getAuthorCredits();
-                       if ($wgMaxCredits > 1) {
-                           $s .= ' ' . $this->getContributorCredits();
-                       }
-              }
-           
-              return $s;
-       }
-
-        function getAuthorCredits() {
-               global $wgLang, $wgArticle;
-
-               $last_author = $wgArticle->getUser();
-           
-               if ($last_author == 0) {
-                   $author_credit = wfMsg('anonymous');
-               } else {
-                   $real_name = User::whoIsReal($last_author);
-                   if (!empty($real_name)) {
-                       $author_credit = $real_name;
-                   } else {
-                       $author_credit = wfMsg('siteuser', User::whoIs($last_author));
-                   }
-               }
-           
-               $timestamp = $wgArticle->getTimestamp();
-               if ( $timestamp ) {
-                       $d = $wgLang->timeanddate( $wgArticle->getTimestamp(), true );
+               if (isset($wgMaxCredits) && $wgMaxCredits != 0) {
+                   require_once("Credits.php");
+                   $s .= ' ' . getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax);
                } else {
-                       $d = '';
+                   $s .= $this->lastModified();
                }
-               return wfMsg('lastmodifiedby', $d, $author_credit);
-       }
 
-        function getContributorCredits() {
-           
-               global $wgArticle, $wgMaxCredits, $wgLang;
+               return $s . ' ' .  $this->getCopyright();
+       }
 
-                # don't count last editor
+       function getCopyright() {
+               global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest;
 
-               $contributors = $wgArticle->getContributors($wgMaxCredits - 1);
-           
-               $real_names = array();
-               $user_names = array();
 
-               # Sift for real versus user names
-               
-               foreach ($contributors as $user_id => $user_parts) {
-                   if ($user_id != 0) {
-                       if (!empty($user_parts[1])) {
-                           $real_names[$user_id] = $user_parts[1];
-                       } else {
-                           $user_names[$user_id] = $user_parts[0];
-                       }
-                   }
-               }
-           
-                $real = $wgLang->listToText(array_values($real_names));
-               $user = $wgLang->listToText(array_values($user_names));
+               $oldid = $wgRequest->getVal( 'oldid' );
+               $diff = $wgRequest->getVal( 'diff' );
 
-               if (!empty($user)) {
-                   $user = wfMsg('siteusers', $user);
-               }
-           
-               if ($contributors[0] && $contributors[0][0] > 0) {
-                   $anon = wfMsg('anonymous');
+               if ( !is_null( $oldid ) && is_null( $diff ) && wfMsg( 'history_copyright' ) !== '-' ) {
+                       $msg = 'history_copyright';
                } else {
-                   $anon = '';
+                       $msg = 'copyright';
                }
-           
-               $creds = $wgLang->listToText(array($real, $user, $anon));
-           
-               return wfMsg('othercontribs', $creds);
-       }
-    
-       function getCopyright() {
-               global $wgRightsPage, $wgRightsUrl, $wgRightsText;
+
                $out = '';
                if( $wgRightsPage ) {
                        $link = $this->makeKnownLink( $wgRightsPage, $wgRightsText );
@@ -880,10 +826,10 @@ class Skin {
                        # Give up now
                        return $out;
                }
-               $out .= wfMsg( 'copyright', $link );
+               $out .= wfMsg( $msg, $link );
                return $out;
        }
-       
+
        function getCopyrightIcon() {
                global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRightsIcon;
                $out = '';
@@ -901,7 +847,7 @@ class Skin {
                }
                return $out;
        }
-       
+
        function getPoweredBy() {
                global $wgStylePath;
                $url = htmlspecialchars( "$wgStylePath/images/poweredby_mediawiki_88x31.png" );
@@ -912,7 +858,7 @@ class Skin {
        function lastModified()
        {
                global $wgLang, $wgArticle;
-               
+
                $timestamp = $wgArticle->getTimestamp();
                if ( $timestamp ) {
                        $d = $wgLang->timeanddate( $wgArticle->getTimestamp(), true );
@@ -927,7 +873,7 @@ class Skin {
        {
                if ( '' != $align ) { $a = ' align="'.$align.'"'; }
                else { $a = ''; }
-               
+
                $mp = wfMsg( 'mainpage' );
                $titleObj = Title::newFromText( $mp );
                $s = '<a href="' . $titleObj->escapeLocalURL()
@@ -940,7 +886,7 @@ class Skin {
        {
                global $wgOut, $wgTitle, $wgUser, $wgRequest, $wgLang;
                global $wgDisableUploads, $wgRemoteUploads;
-           
+
                $fname =  'Skin::quickBar';
                wfProfileIn( $fname );
 
@@ -955,17 +901,17 @@ class Skin {
                $s .= $this->mainPageLink()
                  . $sep . $this->specialLink( 'recentchanges' )
                  . $sep . $this->specialLink( 'randompage' );
-               if ($wgUser->getID()) { 
-               $s.= $sep . $this->specialLink( 'watchlist' ) ; 
+               if ($wgUser->getID()) {
+               $s.= $sep . $this->specialLink( 'watchlist' ) ;
                $s .= $sep .$this->makeKnownLink( $wgLang->specialPage( 'Contributions' ),
-                 wfMsg( 'mycontris' ), 'target=' . wfUrlencode($wgUser->getName() ) );         
-               
+                 wfMsg( 'mycontris' ), 'target=' . wfUrlencode($wgUser->getName() ) );
+
                }
                // only show watchlist link if logged in
                if ( wfMsg ( 'currentevents' ) != '-' ) $s .= $sep . $this->makeKnownLink( wfMsg( 'currentevents' ), '' ) ;
                $s .= "\n<br /><hr class='sep' />";
                $articleExists = $wgTitle->getArticleId();
-               if ( $wgOut->isArticle() || $action =='edit' || $action =='history' || $wpPreview) {                            
+               if ( $wgOut->isArticle() || $action =='edit' || $action =='history' || $wpPreview) {
                        if($wgOut->isArticle()) {
                                $s .= '<strong>' . $this->editThisPage() . '</strong>';
                        } else { # backlink to the article in edit or history mode
@@ -978,15 +924,15 @@ class Skin {
                                                $text = wfMsg('viewtalkpage');
                                                break;
                                                case 2:
-                                               $text = wfMsg('userpage');                              
+                                               $text = wfMsg('userpage');
                                                break;
                                                case 3:
                                                $text = wfMsg('viewtalkpage');
-                                               break;  
-                                               case 4: 
+                                               break;
+                                               case 4:
                                                $text = wfMsg('wikipediapage');
                                                break;
-                                               case 5:                         
+                                               case 5:
                                                $text = wfMsg('viewtalkpage');
                                                break;
                                                case 6:
@@ -998,11 +944,11 @@ class Skin {
                                                default:
                                                $text= wfMsg('articlepage');
                                        }
-                               
+
                                        $link = $wgTitle->getText();
                                        if ($nstext = $wgLang->getNsText($tns) ) { # add namespace if necessary
                                                $link = $nstext . ':' . $link ;
-                                       }                       
+                                       }
 
                                        $s .= $this->makeLink( $link, $text );
                                } elseif( $wgTitle->getNamespace() != Namespace::getSpecial() ) {
@@ -1010,9 +956,9 @@ class Skin {
                                        # and to avoid messing with the separator that is prepended to the next item
                                        $s .= '<strong>' . wfMsg('newpage') . '</strong>';
                                }
-                       
+
                        }
-                       
+
 
                        if( $tns%2 && $action!='edit' && !$wpPreview) {
                                $s.= '<br />'.$this->makeKnownLink($wgTitle->getPrefixedText(),wfMsg('postcomment'),'action=edit&section=new');
@@ -1041,42 +987,42 @@ class Skin {
                                $s .= $sep . $this->historyLink();
                        }
                        $s.=$sep . $this->whatLinksHere();
-                       
+
                        if($wgOut->isArticleRelated()) {
                                $s .= $sep . $this->watchPageLinksLink();
                        }
 
-                       if ( Namespace::getUser() == $wgTitle->getNamespace() 
+                       if ( Namespace::getUser() == $wgTitle->getNamespace()
                        || $wgTitle->getNamespace() == Namespace::getTalk(Namespace::getUser())
                        ) {
-                       
+
                                $id=User::idFromName($wgTitle->getText());
                                $ip=User::isIP($wgTitle->getText());
-                               
+
                                if($id||$ip) {
                                        $s .= $sep . $this->userContribsLink();
                                }
                                if ( 0 != $wgUser->getID() ) {
                                        if($id) { # can only email real users
-                                               $s .= $sep . $this->emailUserLink(); 
+                                               $s .= $sep . $this->emailUserLink();
                                        }
                                }
                        }
                        $s .= "\n<br /><hr class='sep' />";
-               } 
-               
+               }
+
                if ( 0 != $wgUser->getID() && ( !$wgDisableUploads || $wgRemoteUploads ) ) {
                        $s .= $this->specialLink( 'upload' ) . $sep;
                }
                $s .= $this->specialLink( 'specialpages' )
                  . $sep . $this->bugReportsLink();
-               
+
                global $wgSiteSupportPage;
                if( $wgSiteSupportPage ) {
                        $s .= "\n<br /><a href=\"" . htmlspecialchars( $wgSiteSupportPage ) .
                          '" class="internal">' . wfMsg( 'sitesupport' ) . '</a>';
                }
-       
+
                $s .= "\n<br /></div>\n";
                wfProfileOut( $fname );
                return $s;
@@ -1085,20 +1031,21 @@ class Skin {
        function specialPagesList()
        {
                global $wgUser, $wgOut, $wgLang, $wgServer, $wgRedirectScript;
+               require_once('SpecialPage.php');
                $a = array();
                $pages = SpecialPage::getPages();
-               
+
                foreach ( $pages[''] as $name => $page ) {
                        $a[$name] = $page->getDescription();
                }
                if ( $wgUser->isSysop() )
-               { 
+               {
                        foreach ( $pages['sysop'] as $name => $page ) {
                                $a[$name] = $page->getDescription();
                        }
                }
                if ( $wgUser->isDeveloper() )
-               { 
+               {
                        foreach ( $pages['developer'] as $name => $page ) {
                                $a[$name] = $page->getDescription() ;
                        }
@@ -1154,11 +1101,11 @@ class Skin {
        function editThisPage()
        {
                global $wgOut, $wgTitle, $wgRequest;
-               
+
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
                $redirect = $wgRequest->getVal( 'redirect' );
-               
+
                if ( ! $wgOut->isArticleRelated() ) {
                        $s = wfMsg( 'protectedpage' );
                } else {
@@ -1388,7 +1335,7 @@ class Skin {
                if ( -1 == $tns ) { return ''; }
 
                $pn = $wgTitle->getText();
-               $tp = wfMsg( 'talkpage' );              
+               $tp = wfMsg( 'talkpage' );
                if ( Namespace::isTalk( $tns ) ) {
                        $lns = Namespace::getSubject( $tns );
                        switch($tns) {
@@ -1398,7 +1345,7 @@ class Skin {
                                case 3:
                                $text = wfMsg('userpage');
                                break;
-                               case 5: 
+                               case 5:
                                $text = wfMsg('wikipediapage');
                                break;
                                case 7:
@@ -1410,7 +1357,7 @@ class Skin {
                } else {
 
                        $lns = Namespace::getTalk( $tns );
-                       $text=$tp;                      
+                       $text=$tp;
                }
                $n = $wgLang->getNsText( $lns );
                if ( '' == $n ) { $link = $pn; }
@@ -1490,10 +1437,10 @@ class Skin {
                        return $text == '' ? $title : $text;
                }
        }
-       
+
        function makeStubLink( $title, $text = '', $query = '', $trail = '' ) {
                $nt = Title::newFromText( $title );
-               if ($nt) {              
+               if ($nt) {
                        return $this->makeStubLinkObj( Title::newFromText( $title ), $text, $query, $trail );
                } else {
                        wfDebug( 'Invalid title passed to Skin::makeStubLink(): "'.$title."\"\n" );
@@ -1505,6 +1452,12 @@ class Skin {
        function makeLinkObj( &$nt, $text= '', $query = '', $trail = '', $prefix = '' )
        {
                global $wgOut, $wgUser;
+               $fname = 'Skin::makeLinkObj';
+
+               # Fail gracefully
+               if ( ! isset($nt) )
+                       return "<!-- ERROR -->{$prefix}{$text}{$trail}";
+
                if ( $nt->isExternal() ) {
                        $u = $nt->getFullURL();
                        $link = $nt->getPrefixedURL();
@@ -1525,31 +1478,46 @@ class Skin {
                                ( Namespace::getImage() == $nt->getNamespace() ) ) {
                        $retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
                } else {
-                       $aid = $nt->getArticleID() ;
-                       if ( 0 == $aid ) {
-                               $retVal = $this->makeBrokenLinkObj( $nt, $text, $query, $trail, $prefix );
+                       if ( $this->postParseLinkColour() ) {
+                               $inside = '';
+                               if ( '' != $trail ) {
+                                       if ( preg_match( $this->linktrail, $trail, $m ) ) {
+                                               $inside = $m[1];
+                                               $trail = $m[2];
+                                       }
+                               }
+
+                               # Allows wiki to bypass using linkcache, see OutputPage::parseLinkHolders()
+                               $retVal = '<!--LINK ' . implode( ' ', array( $nt->getNamespace(), $nt->getDBkey(),
+                                       $query, $prefix . $text . $inside ) ) . "-->{$trail}";
                        } else {
-                               $threshold = $wgUser->getOption('stubthreshold') ;
-                               if ( $threshold > 0 ) {
-                                       $res = wfQuery ( "SELECT LENGTH(cur_text) AS x, cur_namespace, cur_is_redirect FROM cur WHERE cur_id='{$aid}'", DB_READ ) ;
-
-                                       if ( wfNumRows( $res ) > 0 ) {
-                                               $s = wfFetchObject( $res );
-                                               $size = $s->x;
-                                               if ( $s->cur_is_redirect OR $s->cur_namespace != 0 ) {
+                               # Work out link colour immediately
+                               $aid = $nt->getArticleID() ;
+                               if ( 0 == $aid ) {
+                                       $retVal = $this->makeBrokenLinkObj( $nt, $text, $query, $trail, $prefix );
+                               } else {
+                                       $threshold = $wgUser->getOption('stubthreshold') ;
+                                       if ( $threshold > 0 ) {
+                                               $dbr =& wfGetDB( DB_SLAVE );
+                                               $s = $dbr->selectRow( 'cur', array( 'LENGTH(cur_text) AS x', 'cur_namespace',
+                                                       'cur_is_redirect' ), array( 'cur_id' => $aid ), $fname ) ;
+                                               if ( $s !== false ) {
+                                                       $size = $s->x;
+                                                       if ( $s->cur_is_redirect OR $s->cur_namespace != 0 ) {
+                                                               $size = $threshold*2 ; # Really big
+                                                       }
+                                                       $dbr->freeResult( $res );
+                                               } else {
                                                        $size = $threshold*2 ; # Really big
                                                }
-                                               wfFreeResult( $res );
                                        } else {
-                                               $size = $threshold*2 ; # Really big
+                                               $size = 1 ;
+                                       }
+                                       if ( $size < $threshold ) {
+                                               $retVal = $this->makeStubLinkObj( $nt, $text, $query, $trail, $prefix );
+                                       } else {
+                                               $retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
                                        }
-                               } else {
-                                       $size = 1 ;
-                               }
-                               if ( $size < $threshold ) {
-                                       $retVal = $this->makeStubLinkObj( $nt, $text, $query, $trail, $prefix );
-                               } else {
-                                       $retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
                                }
                        }
                }
@@ -1559,11 +1527,14 @@ class Skin {
        # Pass a title object, not a title string
        function makeKnownLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '')
        {
-               global $wgOut, $wgTitle;
+               global $wgOut, $wgTitle, $wgInputEncoding;
 
                $fname = 'Skin::makeKnownLinkObj';
                wfProfileIn( $fname );
 
+               if ( !is_object( $nt ) ) {
+                       return $text;
+               }
                $link = $nt->getPrefixedURL();
 
                if ( '' == $link ) {
@@ -1575,7 +1546,12 @@ class Skin {
                        $u = $nt->escapeLocalURL( $query );
                }
                if ( '' != $nt->getFragment() ) {
-                       $u .= '#' . htmlspecialchars( $nt->getFragment() );
+                       $anchor = urlencode( do_html_entity_decode( str_replace(' ', '_', $nt->getFragment()), ENT_COMPAT, $wgInputEncoding ) );
+                       $replacearray = array(
+                               '%3A' => ':',
+                               '%' => '.'
+                       );
+                       $u .= '#' . str_replace(array_keys($replacearray),array_values($replacearray),$anchor);
                }
                if ( '' == $text ) {
                        $text = htmlspecialchars( $nt->getPrefixedText() );
@@ -1630,7 +1606,7 @@ class Skin {
                wfProfileOut( $fname );
                return $s;
        }
-       
+
        # Pass a title object, not a title string
        function makeStubLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' )
        {
@@ -1659,7 +1635,7 @@ class Skin {
                }
                return $s;
        }
-       
+
        function makeSelfLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' )
        {
                $u = $nt->escapeLocalURL( $query );
@@ -1679,80 +1655,80 @@ class Skin {
        /* these are used extensively in SkinPHPTal, but also some other places */
        /*static*/ function makeSpecialUrl( $name, $urlaction='' ) {
                $title = Title::makeTitle( NS_SPECIAL, $name );
-               $this->checkTitle($title, $name);       
+               $this->checkTitle($title, $name);
                return $title->getLocalURL( $urlaction );
        }
        /*static*/ function makeTalkUrl ( $name, $urlaction='' ) {
                $title = Title::newFromText( $name );
                $title = $title->getTalkPage();
-               $this->checkTitle($title, $name);       
+               $this->checkTitle($title, $name);
                return $title->getLocalURL( $urlaction );
        }
        /*static*/ function makeArticleUrl ( $name, $urlaction='' ) {
                $title = Title::newFromText( $name );
                $title= $title->getSubjectPage();
-               $this->checkTitle($title, $name);       
+               $this->checkTitle($title, $name);
                return $title->getLocalURL( $urlaction );
        }
        /*static*/ function makeI18nUrl ( $name, $urlaction='' ) {
                $title = Title::newFromText( wfMsg($name) );
-               $this->checkTitle($title, $name);       
+               $this->checkTitle($title, $name);
                return $title->getLocalURL( $urlaction );
        }
        /*static*/ function makeUrl ( $name, $urlaction='' ) {
                $title = Title::newFromText( $name );
-               $this->checkTitle($title, $name);       
-               return $title->getLocalURL( $urlaction ); 
+               $this->checkTitle($title, $name);
+               return $title->getLocalURL( $urlaction );
        }
        # this can be passed the NS number as defined in Language.php
        /*static*/ function makeNSUrl( $name, $urlaction='', $namespace=0 ) {
                $title = Title::makeTitle( $namespace, $name );
-               $this->checkTitle($title, $name);       
+               $this->checkTitle($title, $name);
                return $title->getLocalURL( $urlaction );
        }
-       
+
        /* these return an array with the 'href' and boolean 'exists' */
        /*static*/ function makeUrlDetails ( $name, $urlaction='' ) {
                $title = Title::newFromText( $name );
                $this->checkTitle($title, $name);
-               return array( 
+               return array(
                        'href' => $title->getLocalURL( $urlaction ),
                        'exists' => $title->getArticleID() != 0?true:false
-               ); 
+               );
        }
        /*static*/ function makeTalkUrlDetails ( $name, $urlaction='' ) {
                $title = Title::newFromText( $name );
                $title = $title->getTalkPage();
                $this->checkTitle($title, $name);
-               return array( 
+               return array(
                        'href' => $title->getLocalURL( $urlaction ),
                        'exists' => $title->getArticleID() != 0?true:false
-               ); 
+               );
        }
        /*static*/ function makeArticleUrlDetails ( $name, $urlaction='' ) {
                $title = Title::newFromText( $name );
                $title= $title->getSubjectPage();
                $this->checkTitle($title, $name);
-               return array( 
+               return array(
                        'href' => $title->getLocalURL( $urlaction ),
                        'exists' => $title->getArticleID() != 0?true:false
-               ); 
+               );
        }
        /*static*/ function makeI18nUrlDetails ( $name, $urlaction='' ) {
                $title = Title::newFromText( wfMsg($name) );
                $this->checkTitle($title, $name);
-               return array( 
+               return array(
                        'href' => $title->getLocalURL( $urlaction ),
                        'exists' => $title->getArticleID() != 0?true:false
-               ); 
+               );
        }
 
        # make sure we have some title to operate on
-       /*static*/ function checkTitle ( &$title, &$name ) { 
+       /*static*/ function checkTitle ( &$title, &$name ) {
                if(!is_object($title)) {
                        $title = Title::newFromText( $name );
                        if(!is_object($title)) {
-                               $title = Title::newFromText( '<error: link target missing>' );
+                               $title = Title::newFromText( '--error: link target missing--' );
                        }
                }
        }
@@ -1773,7 +1749,7 @@ class Skin {
                $s = '<img src="'.$url.'" alt="'.$alt.'" />';
                return $s;
        }
-       
+
        function makeImageLink( $name, $url, $alt = '' ) {
                $nt = Title::makeTitle( Namespace::getImage(), $name );
                return $this->makeImageLinkObj( $nt, $alt );
@@ -1797,9 +1773,9 @@ class Skin {
                        #  * ___px              scale to ___ pixels width, no aligning. e.g. use in taxobox
                        #  * center             center the image
                        #  * framed             Keep original image size, no magnify-button.
-       
+
                        $part = explode( '|', $alt);
-       
+
                        $mwThumb  =& MagicWord::get( MAG_IMG_THUMBNAIL );
                        $mwLeft   =& MagicWord::get( MAG_IMG_LEFT );
                        $mwRight  =& MagicWord::get( MAG_IMG_RIGHT );
@@ -1810,10 +1786,17 @@ class Skin {
                        $alt = $part[count($part)-1];
 
                        $height = $framed = $thumb = false;
+                       $manual_thumb = "" ;
 
                        foreach( $part as $key => $val ) {
+                               $val_parts = explode ( "=" , $val , 2 ) ;
+                               $left_part = array_shift ( $val_parts ) ;
                                if ( ! is_null( $mwThumb->matchVariableStartToEnd($val) ) ) {
                                        $thumb=true;
+                               } elseif ( count ( $val_parts ) == 1 && ! is_null( $mwThumb->matchVariableStartToEnd($left_part) ) ) {
+                                       # use manually specified thumbnail
+                                       $thumb=true;
+                                       $manual_thumb = array_shift ( $val_parts ) ;
                                } elseif ( ! is_null( $mwRight->matchVariableStartToEnd($val) ) ) {
                                        # remember to set an alignment, don't render immediately
                                        $align = 'right';
@@ -1844,9 +1827,9 @@ class Skin {
                                $postfix = '</span>';
                                $align   = 'none';
                        }
-       
+
                        if ( $thumb || $framed ) {
-       
+
                                # Create a thumbnail. Alignment depends on language
                                # writing direction, # right aligned for left-to-right-
                                # languages ("Western languages"), left-aligned
@@ -1860,23 +1843,23 @@ class Skin {
                                if ( ! isset($width) ) {
                                        $width = 180;
                                }
-                               return $prefix.$this->makeThumbLinkObj( $img, $alt, $align, $width, $height, $framed ).$postfix;
-       
+                               return $prefix.$this->makeThumbLinkObj( $img, $alt, $align, $width, $height, $framed, $manual_thumb ).$postfix;
+
                        } elseif ( isset($width) ) {
-                               
+
                                # Create a resized image, without the additional thumbnail
                                # features
 
-                               if (    ( ! $height === false ) 
+                               if (    ( ! $height === false )
                                     && ( $img->getHeight() * $width / $img->getWidth() > $height ) ) {
                                        print "height=$height<br>\nimg->getHeight() = ".$img->getHeight()."<br>\n";
                                        print 'rescaling by factor '. $height / $img->getHeight() . "<br>\n";
                                        $width = $img->getWidth() * $height / $img->getHeight();
                                }
-                               $url = $img->createThumb( $width );
+                               if ( '' == $manual_thumb ) $url = $img->createThumb( $width );
                        }
                } # endif $wgUseImageResize
-                       
+
                if ( empty( $alt ) ) {
                        $alt = preg_replace( '/\.(.+?)^/', '', $img->getName() );
                }
@@ -1885,7 +1868,7 @@ class Skin {
                $u = $nt->escapeLocalURL();
                if ( $url == '' )
                {
-                       $s = str_replace( "$1", $img->getName(), wfMsg('missingimage') );
+                       $s = wfMsg( 'missingimage', $img->getName() );
                        $s .= "<br>{$alt}<br>{$url}<br>\n";
                } else {
                        $s = '<a href="'.$u.'" class="image" title="'.$alt.'">' .
@@ -1897,16 +1880,17 @@ class Skin {
                return str_replace("\n", ' ',$prefix.$s.$postfix);
        }
 
-
-       function makeThumbLinkObj( $img, $label = '', $align = 'right', $boxwidth = 180, $boxheight=false, $framed=false ) {
+       # Make HTML for a thumbnail including image, border and caption
+       # $img is an Image object
+       function makeThumbLinkObj( $img, $label = '', $align = 'right', $boxwidth = 180, $boxheight=false, $framed=false , $manual_thumb = "" ) {
                global $wgStylePath, $wgLang;
                # $image = Title::makeTitle( Namespace::getImage(), $name );
                $url  = $img->getURL();
-               
+
                #$label = htmlspecialchars( $label );
                $alt = preg_replace( '/<[^>]*>/', '', $label);
                $alt = htmlspecialchars( $alt );
-               
+
                if ( $img->exists() )
                {
                        $width  = $img->getWidth();
@@ -1930,7 +1914,22 @@ class Skin {
                        } else {
                                $boxheight = $h;
                        }
-                       $thumbUrl = $img->createThumb( $boxwidth );
+                       if ( '' == $manual_thumb ) $thumbUrl = $img->createThumb( $boxwidth );
+               }
+
+               if ( $manual_thumb != '' ) # Use manually specified thumbnail
+               {
+                       $manual_title = Title::makeTitle( Namespace::getImage(), $manual_thumb ); #new Title ( $manual_thumb ) ;
+                       $manual_img = Image::newFromTitle( $manual_title );
+                       $thumbUrl = $manual_img->getURL();
+                       if ( $manual_img->exists() )
+                       {
+                               $width  = $manual_img->getWidth();
+                               $height = $manual_img->getHeight();
+                               $boxwidth = $width ;
+                               $boxheight = $height ;
+                               $oboxwidth = $boxwidth + 2 ;
+                       }
                }
 
                $u = $img->getEscapeLocalURL();
@@ -1941,7 +1940,7 @@ class Skin {
 
                $s = "<div class=\"thumb t{$align}\"><div style=\"width:{$oboxwidth}px;\">";
                if ( $thumbUrl == '' ) {
-                       $s .= str_replace( "$1", $img->getName(), wfMsg('missingimage') );
+                       $s .= wfMsg( 'missingimage', $img->getName() );
                        $zoomicon = '';
                } else {
                        $s .= '<a href="'.$u.'" class="internal" title="'.$alt.'">'.
@@ -1969,7 +1968,7 @@ class Skin {
        {
                if ( ! isset( $nt ) )
                {
-                       ### HOTFIX. Instead of breaking, return empry string.
+                       ### HOTFIX. Instead of breaking, return empty string.
                        $s = $alt;
                } else {
                        $name = $nt->getDBKey();
@@ -1977,7 +1976,7 @@ class Skin {
                        if ( empty( $alt ) ) {
                                $alt = preg_replace( '/\.(.+?)^/', '', $name );
                        }
-       
+
                        $u = htmlspecialchars( $url );
                        $s = "<a href=\"{$u}\" class='internal' title=\"{$alt}\">{$alt}</a>";
                }
@@ -1993,7 +1992,7 @@ class Skin {
                return $this->makeKnownLink( $wgLang->specialPage( $pn ),
                  wfMsg( $key ) );
        }
-       
+
        function makeExternalLink( $url, $text, $escape = true ) {
                $style = $this->getExternalLinkAttributes( $url, $text );
                $url = htmlspecialchars( $url );
@@ -2050,7 +2049,7 @@ class Skin {
                $r .= '<img src="'.$wgStylePath.'/images/Arr_.png" width="12" height="12" border="0" />' ;
                $r .= '<tt>' ;
 
-               if ( $rc_type == RC_MOVE ) {
+               if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
                        $r .= '&nbsp;&nbsp;';
                } else {
                        # M & N (minor & new)
@@ -2078,9 +2077,9 @@ class Skin {
                if ( $rcObj->watched ) $link = '<strong>'.$link.'</strong>' ;
                $r .= $link ;
 
-               # Cur
+               # Diff
                $r .= ' (' ;
-               $r .= $rcObj->curlink ;
+               $r .= $rcObj->difflink ;
                $r .= '; ' ;
 
                # Hist
@@ -2091,7 +2090,7 @@ class Skin {
                $r .= $rcObj->usertalklink ;
 
                # Comment
-               if ( $rc_comment != '' && $rc_type != RC_MOVE ) {
+                if ( $rc_comment != '' && $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) {
                        $rc_comment=$this->formatComment($rc_comment);
                        $r .= $wgLang->emphasize( ' ('.$rc_comment.')' );
                }
@@ -2156,13 +2155,13 @@ class Skin {
                $link = $block[0]->link ;
                if ( $block[0]->watched ) $link = '<strong>'.$link.'</strong>' ;
                $r .= $link ;
-               
+
                $curIdEq = 'curid=' . $block[0]->mAttribs['rc_cur_id'];
                if ( $block[0]->mAttribs['rc_type'] != RC_LOG ) {
                        # Changes
                        $r .= ' ('.count($block).' ' ;
                        if ( $isnew ) $r .= wfMsg('changes');
-                       else $r .= $this->makeKnownLinkObj( $block[0]->getTitle() , wfMsg('changes') , 
+                       else $r .= $this->makeKnownLinkObj( $block[0]->getTitle() , wfMsg('changes') ,
                                $curIdEq.'&diff=0&oldid='.$oldid ) ;
                        $r .= '; ' ;
 
@@ -2179,7 +2178,7 @@ class Skin {
                foreach ( $block AS $rcObj ) {
                        # Get rc_xxxx variables
                        extract( $rcObj->mAttribs );
-                       
+
                        $r .= '<img src="'.$wgStylePath.'/images/Arr_.png" width="12" height="12" />';
                        $r .= '<tt>&nbsp; &nbsp; &nbsp; &nbsp;' ;
                        if ( $rc_new ) $r .= $N ;
@@ -2251,7 +2250,7 @@ class Skin {
 
        function recentChangesLineOld( &$rc, $watched = false )
        {
-               global $wgTitle, $wgLang, $wgUser, $wgRCSeconds;
+               global $wgTitle, $wgLang, $wgUser, $wgRCSeconds, $wgUseRCPatrol, $wgOnlySysopsCanPatrol;
 
                # Extract DB fields into local scope
                extract( $rc->mAttribs );
@@ -2266,27 +2265,34 @@ class Skin {
                        $this->lastdate = $date;
                        $this->rclistOpen = true;
                }
-               $s .= '<li> ';
 
-               if ( $rc_type == RC_MOVE ) {
+               # If this edit has not yet been patrolled, make it stick out
+               $s .= ( ! $wgUseRCPatrol || $rc_patrolled ) ? '<li> ' : '<li class="not_patrolled"> ';
+
+               if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
                        # Diff
                        $s .= '(' . wfMsg( 'diff' ) . ') (';
                        # Hist
                        $s .= $this->makeKnownLinkObj( $rc->getMovedToTitle(), wfMsg( 'hist' ), 'action=history' ) .
                                ') . . ';
-                       
-                       # "[[x]] moved to [[y]]"
 
-                       $s .= wfMsg( '1movedto2', $this->makeKnownLinkObj( $rc->getTitle(), '', 'redirect=no' ),
+                       # "[[x]] moved to [[y]]"
+                       $msg = ( $rc_type == RC_MOVE ) ? '1movedto2' : '1movedto2_redir';
+                       $s .= wfMsg( $msg, $this->makeKnownLinkObj( $rc->getTitle(), '', 'redirect=no' ),
                                $this->makeKnownLinkObj( $rc->getMovedToTitle(), '' ) );
-
                } else {
                        # Diff link
                        if ( $rc_type == RC_NEW || $rc_type == RC_LOG ) {
                                $diffLink = wfMsg( 'diff' );
                        } else {
+                               if ( $wgUseRCPatrol && $rc_patrolled == 0 && $wgUser->getID() != 0 &&
+                                    ( $wgUser->isSysop() || !$wgOnlySysopsCanPatrol ) )
+                                       $rcidparam = "&rcid={$rc_id}";
+                               else
+                                       $rcidparam = "";
                                $diffLink = $this->makeKnownLinkObj( $rc->getTitle(), wfMsg( 'diff' ),
-                                 $curIdEq.'&diff='.$rc_this_oldid.'&oldid='.$rc_last_oldid  ,'' ,'' , ' tabindex="'.$rc->counter.'"');
+                                 "{$curIdEq}&diff={$rc_this_oldid}&oldid={$rc_last_oldid}{$rcidparam}",
+                                 '', '', ' tabindex="'.$rc->counter.'"');
                        }
                        $s .= '('.$diffLink.') (';
 
@@ -2301,7 +2307,13 @@ class Skin {
                        if ( $rc_type == RC_NEW ) { $s .= '<strong>'.$N.'</strong>'; }
 
                        # Article link
-                       $articleLink = $this->makeKnownLinkObj( $rc->getTitle(), '' );
+                       # If it's a new article, there is no diff link, but if it hasn't been
+                       # patrolled yet, we need to give users a way to do so
+                       if ( $wgUseRCPatrol && $rc_type == RC_NEW && $rc_patrolled == 0 &&
+                            $wgUser->getID() != 0 && ( $wgUser->isSysop() || !$wgOnlySysopsCanPatrol ) )
+                               $articleLink = $this->makeKnownLinkObj( $rc->getTitle(), '', "rcid={$rc_id}" );
+                       else
+                               $articleLink = $this->makeKnownLinkObj( $rc->getTitle(), '' );
 
                        if ( $watched ) {
                                $articleLink = '<strong>'.$articleLink.'</strong>';
@@ -2345,7 +2357,7 @@ class Skin {
                if($userTalkLink) $s.=' ('.$userTalkLink.')';
 
                # Add comment
-               if ( '' != $rc_comment && '*' != $rc_comment && $rc_type != RC_MOVE ) {
+               if ( '' != $rc_comment && '*' != $rc_comment && $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) {
                        $rc_comment=$this->formatComment($rc_comment);
                        $s .= $wgLang->emphasize(' (' . $rc_comment . ')');
                }
@@ -2354,7 +2366,6 @@ class Skin {
                return $s;
        }
 
-#      function recentChangesLineNew( $ts, $u, $ut, $ns, $ttl, $c, $isminor, $isnew, $watched = false, $oldid = 0 , $diffid = 0 )
        function recentChangesLineNew( &$baseRC, $watched = false )
        {
                global $wgTitle, $wgLang, $wgUser, $wgRCSeconds;
@@ -2368,7 +2379,7 @@ class Skin {
 
                # If it's a new day, add the headline and flush the cache
                $date = $wgLang->date( $rc_timestamp, true);
-               $ret = '' ;
+               $ret = '';
                if ( $date != $this->lastdate ) {
                        # Process current cache
                        $ret = $this->recentChangesBlock () ;
@@ -2376,32 +2387,35 @@ class Skin {
                        $ret .= "<h4>{$date}</h4>\n";
                        $this->lastdate = $date;
                }
-               
+
                # Make article link
-               if ( $rc_type == RC_MOVE ) {
-                       $clink = $this->makeKnownLinkObj( $rc->getTitle(), '', 'redirect=no' );
-                       $clink .= ' ' . wfMsg('movedto') . ' ';
-                       $clink .= $this->makeKnownLinkObj( $rc->getMovedToTitle(), '' );
+               if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
+                       $msg = ( $rc_type == RC_MOVE ) ? "1movedto2" : "1movedto2_redir";
+                       $clink = wfMsg( $msg, $this->makeKnownLinkObj( $rc->getTitle(), '', 'redirect=no' ),
+                         $this->makeKnownLinkObj( $rc->getMovedToTitle(), '' ) );
                } else {
                        $clink = $this->makeKnownLinkObj( $rc->getTitle(), '' ) ;
                }
-               
+
                $time = $wgLang->time( $rc_timestamp, true, $wgRCSeconds );
                $rc->watched = $watched ;
                $rc->link = $clink ;
                $rc->timestamp = $time;
-               
-               # Make "cur" link
-               if ( ( $rc_type == RC_NEW && $rc_this_oldid == 0 ) || $rc_type == RC_LOG || $rc_type == RC_MOVE) {
+
+               # Make "cur" and "diff" links
+               if ( ( $rc_type == RC_NEW && $rc_this_oldid == 0 ) || $rc_type == RC_LOG || $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
                        $curLink = wfMsg( 'cur' );
+                       $diffLink = wfMsg( 'diff' );
                } else {
-                       $curLink = $this->makeKnownLinkObj( $rc->getTitle(), wfMsg( 'cur' ),
-                         $curIdEq.'&diff=0&oldid='.$rc_this_oldid ,'' ,'' , ' tabindex="'.$baseRC->counter.'"' );
+                       $query = $curIdEq.'&diff=0&oldid='.$rc_this_oldid;
+                       $aprops = ' tabindex="'.$baseRC->counter.'"';
+                       $curLink = $this->makeKnownLinkObj( $rc->getTitle(), wfMsg( 'cur' ), $query, '' ,'' , $aprops );
+                       $diffLink = $this->makeKnownLinkObj( $rc->getTitle(), wfMsg( 'diff'), $query, '' ,'' , $aprops );
                }
 
                # Make "last" link
                $titleObj = $rc->getTitle();
-               if ( $rc_last_oldid == 0 || $rc_type == RC_LOG || $rc_type == RC_MOVE ) {
+               if ( $rc_last_oldid == 0 || $rc_type == RC_LOG || $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
                        $lastLink = wfMsg( 'last' );
                } else {
                        $lastLink = $this->makeKnownLinkObj( $rc->getTitle(), wfMsg( 'last' ),
@@ -2409,23 +2423,24 @@ class Skin {
                }
 
                # Make user link (or user contributions for unregistered users)
-               if ( 0 == $rc_user ) {
+               if ( $rc_user == 0 ) {
                        $userLink = $this->makeKnownLink( $wgLang->specialPage( 'Contributions' ),
                        $rc_user_text, 'target=' . $rc_user_text );
-               } else { 
+               } else {
                        $userLink = $this->makeLink( $wgLang->getNsText(
-                         Namespace::getUser() ) . ':'.$rc_user_text, $rc_user_text ); 
+                         Namespace::getUser() ) . ':'.$rc_user_text, $rc_user_text );
                }
 
-               $rc->userlink = $userLink ;
-               $rc->lastlink = $lastLink ;
-               $rc->curlink = $curLink ;
+               $rc->userlink = $userLink;
+               $rc->lastlink = $lastLink;
+               $rc->curlink  = $curLink;
+               $rc->difflink = $diffLink;
 
-               # Make user talk link           
+               # Make user talk link
                $utns=$wgLang->getNsText(NS_USER_TALK);
                $talkname=$wgLang->getNsText(NS_TALK); # use the shorter name
-               $userTalkLink= $this->makeLink($utns . ':'.$rc_user_text, $talkname );  
-               
+               $userTalkLink= $this->makeLink($utns . ':'.$rc_user_text, $talkname );
+
                global $wgDisableAnonTalk;
                if ( ( 0 == $rc_user ) && $wgUser->isSysop() ) {
                        $blockLink = $this->makeKnownLink( $wgLang->specialPage(
@@ -2445,7 +2460,7 @@ class Skin {
                # Page moves go on their own line
                $title = $rc->getTitle();
                $secureName = $title->getPrefixedDBkey();
-               if ( $rc_type == RC_MOVE ) {
+               if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
                        # Use an @ character to prevent collision with page names
                        $this->rc_cache['@@' . ($this->rcMoveIndex++)] = array($rc);
                } else {
@@ -2489,27 +2504,31 @@ class Skin {
 
                # format regular and media links - all other wiki formatting
                # is ignored
-               while(preg_match('/\[\[(.*?)(\|(.*?))*\]\]/',$comment,$match)) {
-
-                       $medians = $wgLang->getNsText(Namespace::getMedia()).':';
-                       $func='makeLink';
-                       if(preg_match('/^'.$medians.'/i',$match[1])) {
-                               $func='makeMediaLink';
-                       }
+               $medians = $wgLang->getNsText(Namespace::getMedia()).':';
+               while(preg_match('/\[\[(.*?)(\|(.*?))*\]\](.*)$/',$comment,$match)) {
                        # Handle link renaming [[foo|text]] will show link as "text"
-                       if(isset($match[3]) ) {
-                               $comment=
-                               preg_replace('/\[\[(.*?)\]\]/',
-                               $this->$func($match[1],$match[3]),$comment,1);
+                       if( "" != $match[3] ) {
+                               $text = $match[3];
                        } else {
-                               $comment=
-                               preg_replace('/\[\[(.*?)\]\]/',
-                               $this->$func($match[1],$match[1]),$comment,1);
+                               $text = $match[1];
                        }
+                       if( preg_match( '/^' . $medians . '(.*)$/i', $match[1], $submatch ) ) {
+                               # Media link; trail not supported.
+                               $linkRegexp = '/\[\[(.*?)\]\]/';
+                               $thelink = $this->makeMediaLink( $submatch[1], "", $text );
+                       } else {
+                               # Other kind of link
+                               if( preg_match( wfMsg( "linktrail" ), $match[4], $submatch ) ) {
+                                       $trail = $submatch[1];
+                               } else {
+                                       $trail = "";
+                               }
+                               $linkRegexp = '/\[\[(.*?)\]\]' . preg_quote( $trail, '/' ) . '/';
+                               $thelink = $this->makeLink( $match[1], $text, "", $trail );
+                       }
+                       $comment = preg_replace( $linkRegexp, $thelink, $comment, 1 );
                }
-
                return $comment;
-
        }
 
        function imageHistoryLine( $iscur, $timestamp, $img, $user, $usertext, $size, $description )
@@ -2518,6 +2537,7 @@ class Skin {
 
                $datetime = $wgLang->timeanddate( $timestamp, true );
                $del = wfMsg( 'deleteimg' );
+               $delall = wfMsg( 'deleteimgcompletely' );
                $cur = wfMsg( 'cur' );
 
                if ( $iscur ) {
@@ -2526,15 +2546,15 @@ class Skin {
                        if ( $wgUser->isSysop() ) {
                                $link = $wgTitle->escapeLocalURL( 'image=' . $wgTitle->getPartialURL() .
                                  '&action=delete' );
-                               $style = $this->getInternalLinkAttributes( $link, $del );
+                               $style = $this->getInternalLinkAttributes( $link, $delall );
 
-                               $dlink = '<a href="'.$link.'"'.$style.'>'.$del.'</a>';
+                               $dlink = '<a href="'.$link.'"'.$style.'>'.$delall.'</a>';
                        } else {
                                $dlink = $del;
                        }
                } else {
                        $url = wfEscapeHTML( wfImageArchiveUrl( $img ) );
-                       if( $wgUser->getID() != 0 ) {
+                       if( $wgUser->getID() != 0 && $wgTitle->userCanEdit() ) {
                                $rlink = $this->makeKnownLink( $wgTitle->getPrefixedText(),
                                           wfMsg( 'revertimg' ), 'action=revert&oldimage=' .
                                           urlencode( $img ) );
@@ -2729,7 +2749,7 @@ class Skin {
                                )
                );
                $toolbar ="<script type='text/javascript'>\n/*<![CDATA[*/\n";
-               
+
                $toolbar.="document.writeln(\"<div id='toolbar'>\");\n";
                foreach($toolarray as $tool) {
 
@@ -2751,20 +2771,12 @@ class Skin {
 
                $toolbar.="addInfobox('" . addslashes( wfMsg( "infobox" ) ) . "','" . addslashes(wfMsg("infobox_alert")) . "');\n";
                $toolbar.="document.writeln(\"</div>\");\n";
-               
+
                $toolbar.="/*]]>*/\n</script>";
                return $toolbar;
        }
 
 }
 
-require_once( 'SkinStandard.php' );
-require_once( 'SkinNostalgia.php' );
-require_once( 'SkinCologneBlue.php' );
-
-if( $wgUsePHPTal ) {
-       require_once( 'SkinPHPTal.php' );
 }
-
-
 ?>