(bug 454) Merge e-notif 2.00
[lhc/web/wiklou.git] / includes / Skin.php
index d24cac3..ebb3018 100644 (file)
@@ -3,6 +3,7 @@
 /**
  *
  * @package MediaWiki
+ * @subpackage Skins
  */
 
 /**
@@ -13,27 +14,6 @@ if( defined( "MEDIAWIKI" ) ) {
 # See skin.doc
 require_once( 'Image.php' );
 
-# These are the INTERNAL names, which get mapped directly to class names and
-# file names in ./skins/. For display purposes, the Language class has
-# internationalized names
-#
-/*
-$wgValidSkinNames = array(
-       'standard'      => 'Standard',
-       'nostalgia'     => 'Nostalgia',
-       'cologneblue'   => 'CologneBlue'
-);
-if( $wgUsePHPTal ) {
-       #$wgValidSkinNames[] = 'PHPTal';
-       #$wgValidSkinNames['davinci'] = 'DaVinci';
-       #$wgValidSkinNames['mono'] = 'Mono';
-       #$wgValidSkinNames['monobookminimal'] = 'MonoBookMinimal';
-       $wgValidSkinNames['monobook'] = 'MonoBook';
-       $wgValidSkinNames['myskin'] = 'MySkin';
-       $wgValidSkinNames['chick'] = 'Chick';
-}
-*/
-
 # Get a list of all skins available in /skins/
 # Build using the regular expression '^(.*).php$'
 # Array keys are all lower case, array value keep the case used by filename
@@ -43,9 +23,9 @@ $skinDir = dir($IP.'/skins');
 
 # while code from www.php.net
 while (false !== ($file = $skinDir->read())) {
-       if(preg_match('/^(.*).php$/',$file, $matches)) {
+       if(preg_match('/^([^.].*)\.php$/',$file, $matches)) {
                $aSkin = $matches[1];
-       $wgValidSkinNames[strtolower($aSkin)] = $aSkin;
+               $wgValidSkinNames[strtolower($aSkin)] = $aSkin;
        }
 }
 $skinDir->close();
@@ -99,13 +79,19 @@ class Skin {
        var $rc_cache ; # Cache for Enhanced Recent Changes
        var $rcCacheIndex ; # Recent Changes Cache Counter for visibility toggle
        var $rcMoveIndex;
-       var $postParseLinkColour = true;
+       var $postParseLinkColour = false;
        /**#@-*/
 
        function Skin() {
-               global $wgUseOldExistenceCheck;
-               $postParseLinkColour = !$wgUseOldExistenceCheck;
-               $this->linktrail = wfMsg('linktrail');
+               global $wgContLang;
+               $this->linktrail = $wgContLang->linkTrail();
+               
+               # Cache option lookups done very frequently
+               $options = array( 'highlightbroken', 'hover' );
+               foreach( $options as $opt ) {
+                       global $wgUser;
+                       $this->mOptions[$opt] = $wgUser->getOption( $opt );
+               }
        }
 
        function getSkinNames() {
@@ -277,7 +263,7 @@ class Skin {
                        # Force no underline
                        $s .= "a { text-decoration: none; }\n";
                }
-               if ( 1 == $wgUser->getOption( 'highlightbroken' ) ) {
+               if ( 1 == $this->mOptions['highlightbroken'] ) {
                        $s .= "a.new, #quickbar a.new { color: #CC2200; }\n";
                }
                if ( 1 == $wgUser->getOption( 'justify' ) ) {
@@ -296,14 +282,14 @@ class Skin {
                }
                else $a = array( 'bgcolor' => '#FFFFFF' );
                if($wgOut->isArticle() && $wgUser->getOption('editondblclick') &&
-                 (!$wgTitle->isProtected() || $wgUser->isSysop()) ) {
+                 (!$wgTitle->isProtected() || $wgUser->isAllowed('protect')) ) {
                        $t = wfMsg( 'editthispage' );
                        $oid = $red = '';
-                       if ( !empty($redirect) ) {
+                       if ( !empty($redirect) && $redirect == 'no' ) {
                                $red = "&redirect={$redirect}";
                        }
                        if ( !empty($oldid) && ! isset( $diff ) ) {
-                               $oid = "&oldid={$oldid}";
+                               $oid = "&oldid=" . IntVal( $oldid );
                        }
                        $s = $wgTitle->getFullURL( "action=edit{$oid}{$red}" );
                        $s = 'document.location = "' .$s .'";';
@@ -315,7 +301,7 @@ class Skin {
        }
 
        function getExternalLinkAttributes( $link, $text, $class='' ) {
-               global $wgUser, $wgOut, $wgContLang;
+               global $wgContLang;
 
                $same = ($link == $text);
                $link = urldecode( $link );
@@ -325,20 +311,18 @@ class Skin {
 
                $r = ($class != '') ? " class='$class'" : " class='external'";
 
-               if ( !$same && $wgUser->getOption( 'hover' ) ) {
+               if( !$same && $this->mOptions['hover'] ) {
                        $r .= " title=\"{$link}\"";
                }
                return $r;
        }
 
        function getInternalLinkAttributes( $link, $text, $broken = false ) {
-               global $wgUser, $wgOut;
-
                $link = urldecode( $link );
                $link = str_replace( '_', ' ', $link );
                $link = htmlspecialchars( $link );
 
-               if ( $broken == 'stub' ) {
+               if( $broken == 'stub' ) {
                        $r = ' class="stub"';
                } else if ( $broken == 'yes' ) {
                        $r = ' class="new"';
@@ -346,7 +330,7 @@ class Skin {
                        $r = '';
                }
 
-               if ( 1 == $wgUser->getOption( 'hover' ) ) {
+               if( $this->mOptions['hover'] ) {
                        $r .= " title=\"{$link}\"";
                }
                return $r;
@@ -356,9 +340,7 @@ class Skin {
         * @param bool $broken
         */
        function getInternalLinkAttributesObj( &$nt, $text, $broken = false ) {
-               global $wgUser, $wgOut;
-
-               if ( $broken == 'stub' ) {
+               if( $broken == 'stub' ) {
                        $r = ' class="stub"';
                } else if ( $broken == 'yes' ) {
                        $r = ' class="new"';
@@ -366,7 +348,7 @@ class Skin {
                        $r = '';
                }
 
-               if ( 1 == $wgUser->getOption( 'hover' ) ) {
+               if( $this->mOptions['hover'] ) {
                        $r .= ' title="' . $nt->getEscapedText() . '"';
                }
                return $r;
@@ -451,6 +433,7 @@ class Skin {
                return $s;
        }
 
+       
        function getCategoryLinks () {
                global $wgOut, $wgTitle, $wgUser, $wgParser;
                global $wgUseCategoryMagic, $wgUseCategoryBrowser, $wgLang;
@@ -472,7 +455,7 @@ class Skin {
                        $s .= '<br/><hr/>';
 
                        # get a big array of the parents tree
-                       $parenttree = $wgTitle->getCategorieBrowser();
+                       $parenttree = $wgTitle->getParentCategoryTree();
 
                        # Render the array as a serie of links
                        function walkThrough ($tree) {
@@ -490,7 +473,7 @@ class Skin {
                                        # add our current element to the list
                                        $eltitle = Title::NewFromText($element);
                                        # FIXME : should be makeLink() [AV]
-                                       $return .= $sk->makeKnownLink($element, $eltitle->getText()).' &gt; ';
+                                       $return .= $sk->makeLink($element, $eltitle->getText()).' &gt; ';
                                }
                                return $return;
                        }
@@ -534,50 +517,7 @@ class Skin {
        }
 
        function doAfterContent() {
-               global $wgUser, $wgOut, $wgContLang;
-               $fname =  'Skin::doAfterContent';
-               wfProfileIn( $fname );
-               wfProfileIn( $fname.'-1' );
-
-               $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' );
-
-               $qb = $this->qbSetting();
-               $shove = ($qb != 0);
-               $left = ($qb == 1 || $qb == 3);
-               if($wgContLang->isRTL()) $left = !$left;
-
-               if ( $shove && $left ) { # Left
-                       $s .= $this->getQuickbarCompensator();
-               }
-               wfProfileOut( $fname.'-2' );
-               wfProfileIn( $fname.'-3' );
-               $l = $wgContLang->isRTL() ? 'right' : 'left';
-               $s .= "<td class='bottom' align='$l' valign='top'>";
-
-               $s .= $this->bottomLinks();
-               $s .= "\n<br />" . $this->mainPageLink()
-                 . ' | ' . $this->aboutLink()
-                 . ' | ' . $this->specialLink( 'recentchanges' )
-                 . ' | ' . $this->searchForm()
-                 . '<br /><span id="pagestats">' . $this->pageStats() . '</span>';
-
-               $s .= "</td>";
-               if ( $shove && !$left ) { # Right
-                       $s .= $this->getQuickbarCompensator();
-               }
-               $s .= "</tr></table>\n</div>\n</div>\n";
-
-               wfProfileOut( $fname.'-3' );
-               wfProfileIn( $fname.'-4' );
-               if ( 0 != $qb ) { $s .= $this->quickBar(); }
-               wfProfileOut( $fname.'-4' );
-               wfProfileOut( $fname );
-               return $s;
+       # overloaded by derived classes
        }
 
        function pageTitleLinks() {
@@ -587,17 +527,20 @@ class Skin {
                $action = $wgRequest->getText( 'action' );
 
                $s = $this->printableLink();
-               if ( wfMsg ( 'disclaimers' ) != '-' )
-                       $s .= ' | ' . $this->makeKnownLink( 
-                               wfMsgForContent( 'disclaimerpage' ), 
-                               wfMsg( 'disclaimers' ) ) ;
+               $disclaimer = $this->disclaimerLink(); # may be empty
+               if( $disclaimer ) {
+                       $s .= ' | ' . $disclaimer;
+               }
 
                if ( $wgOut->isArticleRelated() ) {
                        if ( $wgTitle->getNamespace() == Namespace::getImage() ) {
                                $name = $wgTitle->getDBkey();
-                               $link = htmlspecialchars( Image::wfImageUrl( $name ) );
-                               $style = $this->getInternalLinkAttributes( $link, $name );
-                               $s .= " | <a href=\"{$link}\"{$style}>{$name}</a>";
+                               $image = new Image( $wgTitle->getDBkey() );
+                               if( $image->exists() ) {
+                                       $link = htmlspecialchars( $image->getURL() );
+                                       $style = $this->getInternalLinkAttributes( $link, $name );
+                                       $s .= " | <a href=\"{$link}\"{$style}>{$name}</a>";
+                               }
                        }
                        # This will show the "Approve" link if $wgUseApproval=true;
                        if ( isset ( $wgUseApproval ) && $wgUseApproval )
@@ -628,6 +571,7 @@ class Skin {
                                $s.= ' | <strong>'. wfMsg( 'newmessages', $tl ) . '</strong>';
                                # disable caching
                                $wgOut->setSquidMaxage(0);
+                               $wgOut->enableClientCache(false);
                        }
                }
 
@@ -640,7 +584,7 @@ class Skin {
 
        function getUndeleteLink() {
                global $wgUser, $wgTitle, $wgContLang, $action;
-               if( $wgUser->isSysop() &&
+               if( $wgUser->isAllowed('rollback') &&
                        (($wgTitle->getArticleId() == 0) || ($action == "history")) &&
                        ($n = $wgTitle->isDeleted() ) ) {
                        return wfMsg( 'thisisdeleted',
@@ -677,7 +621,7 @@ class Skin {
                global $wgOut, $wgTitle, $wgUser;
 
                $s = '<h1 class="pagetitle">' . htmlspecialchars( $wgOut->getPageTitle() ) . '</h1>';
-               if($wgUser->getOption( 'editsectiononrightclick' ) && $wgTitle->userCanEdit()) { $s=$this->editSectionScript(0,$s);}
+               if($wgUser->getOption( 'editsectiononrightclick' ) && $wgTitle->userCanEdit()) { $s=$this->editSectionScript($wgTitle, 0,$s);}
                return $s;
        }
 
@@ -837,16 +781,15 @@ class Skin {
                                if($id || $ip) { # both anons and non-anons have contri list
                                        $s .= $sep . $this->userContribsLink();
                                }
-                               if ( 0 != $wgUser->getID() ) { # show only to signed in users
-                                       if($id) {       # can only email non-anons
-                                               $s .= $sep . $this->emailUserLink();
-                                       }
+                               if( $this->showEmailUser( $id ) ) {
+                                       $s .= $sep . $this->emailUserLink();
                                }
                        }
-                       if ( $wgUser->isSysop() && $wgTitle->getArticleId() ) {
-                               $s .= "\n<br />" . $this->deleteThisPage() .
-                               $sep . $this->protectThisPage() .
-                               $sep . $this->moveThisPage();
+                       if ( $wgTitle->getArticleId() ) {
+                               $s .= "\n<br />";
+                               if($wgUser->isAllowed('delete')) { $s .= $this->deleteThisPage(); }
+                               if($wgUser->isAllowed('protect')) { $s .= $sep . $this->protectThisPage(); }
+                               if($wgUser->isAllowed('move')) { $s .= $sep . $this->moveThisPage(); }
                        }
                        $s .= "<br />\n" . $this->otherLanguages();
                }
@@ -854,8 +797,8 @@ class Skin {
        }
 
        function pageStats() {
-               global $wgOut, $wgLang, $wgArticle, $wgRequest;
-               global $wgDisableCounters, $wgMaxCredits, $wgShowCreditsIfMax;
+               global $wgOut, $wgLang, $wgArticle, $wgRequest, $wgUser;
+               global $wgDisableCounters, $wgMaxCredits, $wgShowCreditsIfMax, $wgTitle, $wgPageShowWatchingUsers;
 
                extract( $wgRequest->getValues( 'oldid', 'diff' ) );
                if ( ! $wgOut->isArticle() ) { return ''; }
@@ -877,6 +820,17 @@ class Skin {
                    $s .= $this->lastModified();
                }
 
+               if ($wgPageShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' )) {
+                       $dbr =& wfGetDB( DB_SLAVE );
+                       extract( $dbr->tableNames( 'watchlist' ) );
+                       $sql = "SELECT COUNT(*) AS n FROM $watchlist
+                               WHERE wl_title='" . $dbr->strencode($wgTitle->getDBKey()) .
+                               "' AND  wl_namespace=" . $wgTitle->getNamespace() ;
+                       $res = $dbr->query( $sql, 'Skin::pageStats');
+                       $x = $dbr->fetchObject( $res );
+                       $s .= ' ' . wfMsg('number_of_watching_users_pageview', $x->n );
+               }
+
                return $s . ' ' .  $this->getCopyright();
        }
 
@@ -887,7 +841,7 @@ class Skin {
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
 
-               if ( !is_null( $oldid ) && is_null( $diff ) && wfMsg( 'history_copyright' ) !== '-' ) {
+               if ( !is_null( $oldid ) && is_null( $diff ) && wfMsgForContent( 'history_copyright' ) !== '-' ) {
                        $msg = 'history_copyright';
                } else {
                        $msg = 'copyright';
@@ -902,7 +856,7 @@ class Skin {
                        # Give up now
                        return $out;
                }
-               $out .= wfMsg( $msg, $link );
+               $out .= wfMsgForContent( $msg, $link );
                return $out;
        }
 
@@ -961,152 +915,10 @@ class Skin {
                return $s;
        }
 
-       function quickBar() {
-               global $wgOut, $wgTitle, $wgUser, $wgRequest, $wgContLang;
-               global $wgDisableUploads, $wgRemoteUploads;
-
-               $fname =  'Skin::quickBar';
-               wfProfileIn( $fname );
-
-               $action = $wgRequest->getText( 'action' );
-               $wpPreview = $wgRequest->getBool( 'wpPreview' );
-               $tns=$wgTitle->getNamespace();
-
-               $s = "\n<div id='quickbar'>";
-               $s .= "\n" . $this->logoText() . "\n<hr class='sep' />";
-
-               $sep = "\n<br />";
-               $s .= $this->mainPageLink()
-                 . $sep . $this->specialLink( 'recentchanges' )
-                 . $sep . $this->specialLink( 'randompage' );
-               if ($wgUser->getID()) {
-               $s.= $sep . $this->specialLink( 'watchlist' ) ;
-               $s .= $sep .$this->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
-                 wfMsg( 'mycontris' ), 'target=' . wfUrlencode($wgUser->getName() ) );
-
-               }
-               // only show watchlist link if logged in
-               if ( wfMsg ( 'currentevents' ) != '-' ) 
-                       $s .= $sep . $this->makeKnownLink( wfMsgForContent( 'currentevents' ), '' ) ;
-               $s .= "\n<br /><hr class='sep' />";
-               $articleExists = $wgTitle->getArticleId();
-               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
-                               if($articleExists){ # no backlink if no article
-                                       switch($tns) {
-                                               case 0:
-                                               $text = wfMsg('articlepage');
-                                               break;
-                                               case 1:
-                                               $text = wfMsg('viewtalkpage');
-                                               break;
-                                               case 2:
-                                               $text = wfMsg('userpage');
-                                               break;
-                                               case 3:
-                                               $text = wfMsg('viewtalkpage');
-                                               break;
-                                               case 4:
-                                               $text = wfMsg('wikipediapage');
-                                               break;
-                                               case 5:
-                                               $text = wfMsg('viewtalkpage');
-                                               break;
-                                               case 6:
-                                               $text = wfMsg('imagepage');
-                                               break;
-                                               case 7:
-                                               $text = wfMsg('viewtalkpage');
-                                               break;
-                                               default:
-                                               $text= wfMsg('articlepage');
-                                       }
-
-                                       $link = $wgTitle->getText();
-                                       if ($nstext = $wgContLang->getNsText($tns) ) { # add namespace if necessary
-                                               $link = $nstext . ':' . $link ;
-                                       }
-
-                                       $s .= $this->makeLink( $link, $text );
-                               } elseif( $wgTitle->getNamespace() != Namespace::getSpecial() ) {
-                                       # we just throw in a "New page" text to tell the user that he's in edit mode,
-                                       # 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');
-                       }
-
-                       /*
-                       watching could cause problems in edit mode:
-                       if user edits article, then loads "watch this article" in background and then saves
-                       article with "Watch this article" checkbox disabled, the article is transparently
-                       unwatched. Therefore we do not show the "Watch this page" link in edit mode
-                       */
-                       if ( 0 != $wgUser->getID() && $articleExists) {
-                               if($action!='edit' && $action != 'submit' )
-                               {
-                                       $s .= $sep . $this->watchThisPage();
-                               }
-                               if ( $wgTitle->userCanEdit() )
-                                       $s .= $sep . $this->moveThisPage();
-                       }
-                       if ( $wgUser->isSysop() and $articleExists ) {
-                               $s .= $sep . $this->deleteThisPage() .
-                               $sep . $this->protectThisPage();
-                       }
-                       $s .= $sep . $this->talkLink();
-                       if ($articleExists && $action !='history') {
-                               $s .= $sep . $this->historyLink();
-                       }
-                       $s.=$sep . $this->whatLinksHere();
-
-                       if($wgOut->isArticleRelated()) {
-                               $s .= $sep . $this->watchPageLinksLink();
-                       }
-
-                       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 .= "\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;
-       }
-
+       /**
+        * show a drop-down box of special pages
+        * @TODO crash bug913. Need to be rewrote completly.
+        */
        function specialPagesList() {
                global $wgUser, $wgOut, $wgContLang, $wgServer, $wgRedirectScript;
                require_once('SpecialPage.php');
@@ -1168,9 +980,13 @@ class Skin {
 
 
        function disclaimerLink() {
-               $s = $this->makeKnownLink( wfMsgForContent( 'disclaimerpage' ),
-                 wfMsg( 'disclaimers' ) );
-               return $s;
+               $disclaimers = wfMsg( 'disclaimers' );
+               if ($disclaimers == '-') {
+                       return "";
+               } else {
+                       return $this->makeKnownLink( wfMsgForContent( 'disclaimerpage' ),
+                                                    $disclaimers );
+               }
        }
 
        function editThisPage() {
@@ -1205,7 +1021,7 @@ class Skin {
                global $wgUser, $wgOut, $wgTitle, $wgRequest;
 
                $diff = $wgRequest->getVal( 'diff' );
-               if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isSysop() ) {
+               if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('delete') ) {
                        $n = $wgTitle->getPrefixedText();
                        $t = wfMsg( 'deletethispage' );
 
@@ -1220,7 +1036,7 @@ class Skin {
                global $wgUser, $wgOut, $wgTitle, $wgRequest;
 
                $diff = $wgRequest->getVal( 'diff' );
-               if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isSysop() ) {
+               if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
                        $n = $wgTitle->getPrefixedText();
 
                        if ( $wgTitle->isProtected() ) {
@@ -1260,7 +1076,7 @@ class Skin {
        function moveThisPage() {
                global $wgTitle, $wgContLang;
 
-               if ( $wgTitle->userCanEdit() ) {
+               if ( $wgTitle->userCanMove() ) {
                        $s = $this->makeKnownLink( $wgContLang->specialPage( 'Movepage' ),
                          wfMsg( 'movethispage' ), 'target=' . $wgTitle->getPrefixedURL() );
                } // no message if page is protected - would be redundant
@@ -1291,6 +1107,17 @@ class Skin {
                return $s;
        }
 
+       function showEmailUser( $id ) {
+               global $wgEnableEmail, $wgEnableUserEmail, $wgUser;
+               return $wgEnableEmail &&
+                      $wgEnableUserEmail &&
+                      0 != $wgUser->getID() && # show only to signed in users
+                      0 != $id; # we can only email to non-anons ..
+#                     '' != $id->getEmail() && # who must have an email address stored ..
+#                     0 != $id->getEmailauthenticationtimestamp() && # .. which is authenticated
+#                     1 != $wgUser->getOption('disablemail'); # and not disabled
+       }
+       
        function emailUserLink() {
                global $wgTitle, $wgContLang;
 
@@ -1516,13 +1343,17 @@ class Skin {
        function makeLinkObj( &$nt, $text= '', $query = '', $trail = '', $prefix = '' ) {
                global $wgOut, $wgUser, $wgLinkHolders;
                $fname = 'Skin::makeLinkObj';
+               wfProfileIn( $fname );
 
                # Fail gracefully
                if ( ! isset($nt) ) {
                        # wfDebugDieBacktrace();
+                       wfProfileOut( $fname );
                        return "<!-- ERROR -->{$prefix}{$text}{$trail}";
                }
 
+               $ns = $nt->getNamespace();
+               $dbkey = $nt->getDBkey();
                if ( $nt->isExternal() ) {
                        $u = $nt->getFullURL();
                        $link = $nt->getPrefixedURL();
@@ -1542,60 +1373,68 @@ class Skin {
                        $t = "<a href=\"{$u}\"{$style}>{$text}{$inside}</a>";
                        $nr = array_push($wgInterwikiLinkHolders, $t);
                        $retVal = '<!--IWLINK '. ($nr-1) ."-->{$trail}";
-               } elseif ( 0 == $nt->getNamespace() && "" == $nt->getText() ) {
+               } elseif ( 0 == $ns && "" == $dbkey ) {
+                       # A self-link with a fragment; skip existence check.
                        $retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
-               } elseif ( ( -1 == $nt->getNamespace() ) ||
-                               ( Namespace::getImage() == $nt->getNamespace() ) ) {
+               } elseif ( ( NS_SPECIAL == $ns ) || ( NS_IMAGE == $ns ) ) {
+                       # These are always shown as existing, currently.
+                       # Special pages don't exist in the database; images may
+                       # occasionally be present when there is no description
+                       # page per se, so we always shown them.
                        $retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
-               } else {
-                       if ( $this->postParseLinkColour() ) {
-                               $inside = '';
-                               if ( '' != $trail ) {
-                                       if ( preg_match( $this->linktrail, $trail, $m ) ) {
-                                               $inside = $m[1];
-                                               $trail = $m[2];
-                                       }
+               } elseif ( $this->postParseLinkColour ) {
+                       wfProfileIn( $fname.'-postparse' );
+                       # Insert a placeholder, and we'll work out the existence checks
+                       # in a big lump later.
+                       $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()
-                               $nr = array_push( $wgLinkHolders['namespaces'], $nt->getNamespace() );
-                               $wgLinkHolders['dbkeys'][] = $nt->getDBkey();
-                               $wgLinkHolders['queries'][] = $query;
-                               $wgLinkHolders['texts'][] = $prefix.$text.$inside;
-                               $wgLinkHolders['titles'][] = $nt;
+                       # These get picked up by Parser::replaceLinkHolders()
+                       $nr = array_push( $wgLinkHolders['namespaces'], $nt->getNamespace() );
+                       $wgLinkHolders['dbkeys'][] = $dbkey;
+                       $wgLinkHolders['queries'][] = $query;
+                       $wgLinkHolders['texts'][] = $prefix.$text.$inside;
+                       $wgLinkHolders['titles'][] =& $nt;
 
-                               $retVal = '<!--LINK '. ($nr-1) ."-->{$trail}";
+                       $retVal = '<!--LINK '. ($nr-1) ."-->{$trail}";
+                       wfProfileOut( $fname.'-postparse' );
+               } else {
+                       wfProfileIn( $fname.'-immediate' );
+                       # Work out link colour immediately
+                       $aid = $nt->getArticleID() ;
+                       if ( 0 == $aid ) {
+                               $retVal = $this->makeBrokenLinkObj( $nt, $text, $query, $trail, $prefix );
                        } else {
-                               # 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 {
+                               $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
                                                }
                                        } else {
-                                               $size = 1 ;
-                                       }
-                                       if ( $size < $threshold ) {
-                                               $retVal = $this->makeStubLinkObj( $nt, $text, $query, $trail, $prefix );
-                                       } else {
-                                               $retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
+                                               $size = $threshold*2 ; # Really big
                                        }
+                               } else {
+                                       $size = 1 ;
+                               }
+                               if ( $size < $threshold ) {
+                                       $retVal = $this->makeStubLinkObj( $nt, $text, $query, $trail, $prefix );
+                               } else {
+                                       $retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
                                }
                        }
+                       wfProfileOut( $fname.'-immediate' );
                }
+               wfProfileOut( $fname );
                return $retVal;
        }
 
@@ -1609,21 +1448,18 @@ class Skin {
                wfProfileIn( $fname );
 
                if ( !is_object( $nt ) ) {
+                       wfProfileIn( $fname );
                        return $text;
                }
-               $link = $nt->getPrefixedURL();
-#              if ( '' != $section && substr($section,0,1) != "#" ) {
-#                      $section = ''
-
-               if ( '' == $link ) {
-                       $u = '';
-                       if ( '' == $text ) {
-                               $text = htmlspecialchars( $nt->getFragment() );
-                       }
-               } else {
-                       $u = $nt->escapeLocalURL( $query );
-               }
+               
+               $u = $nt->escapeLocalURL( $query );
                if ( '' != $nt->getFragment() ) {
+                       if( $nt->getPrefixedDbkey() == '' ) {
+                               $u = '';
+                               if ( '' == $text ) {
+                                       $text = htmlspecialchars( $nt->getFragment() );
+                               }
+                       }
                        $anchor = urlencode( do_html_entity_decode( str_replace(' ', '_', $nt->getFragment()), ENT_COMPAT, $wgInputEncoding ) );
                        $replacearray = array(
                                '%3A' => ':',
@@ -1652,8 +1488,6 @@ class Skin {
         * Pass a title object, not a title string
         */
        function makeBrokenLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
-               global $wgOut, $wgUser;
-
                # Fail gracefully
                if ( ! isset($nt) ) {
                        # wfDebugDieBacktrace();
@@ -1682,7 +1516,7 @@ class Skin {
                                $trail = $m[2];
                        }
                }
-               if ( $wgUser->getOption( 'highlightbroken' ) ) {
+               if ( $this->mOptions['highlightbroken'] ) {
                        $s = "<a href=\"{$u}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
                } else {
                        $s = "{$prefix}{$text}{$inside}<a href=\"{$u}\"{$style}>?</a>{$trail}";
@@ -1696,8 +1530,6 @@ class Skin {
         * Pass a title object, not a title string
         */
        function makeStubLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
-               global $wgOut, $wgUser;
-
                $link = $nt->getPrefixedURL();
 
                $u = $nt->escapeLocalURL( $query );
@@ -1714,7 +1546,7 @@ class Skin {
                                $trail = $m[2];
                        }
                }
-               if ( $wgUser->getOption( 'highlightbroken' ) ) {
+               if ( $this->mOptions['highlightbroken'] ) {
                        $s = "<a href=\"{$u}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
                } else {
                        $s = "{$prefix}{$text}{$inside}<a href=\"{$u}\"{$style}>!</a>{$trail}";
@@ -1765,6 +1597,17 @@ class Skin {
                $this->checkTitle($title, $name);
                return $title->getLocalURL( $urlaction );
        }
+
+       # If url string starts with http, consider as external URL, else
+       # internal
+       /*static*/ function makeInternalOrExternalUrl( $name ) {
+               if ( strncmp( $name, 'http', 4 ) == 0 ) {
+                       return $name;
+               } else {
+                       return $this->makeUrl( $name );
+               }
+       }
+
        # this can be passed the NS number as defined in Language.php
        /*static*/ function makeNSUrl( $name, $urlaction='', $namespace=0 ) {
                $title = Title::makeTitleSafe( $namespace, $name );
@@ -1830,7 +1673,6 @@ class Skin {
 
        function makeImage( $url, $alt = '' ) {
                global $wgOut;
-
                if ( '' == $alt ) {
                        $alt = $this->fnamePart( $url );
                }
@@ -1846,121 +1688,117 @@ class Skin {
        function makeImageLinkObj( $nt, $alt = '' ) {
                global $wgContLang, $wgUseImageResize;
                $img   = Image::newFromTitle( $nt );
-               $url   = $img->getURL();
+               $url   = $img->getViewURL();
 
                $align = '';
                $prefix = $postfix = '';
 
-               if ( $wgUseImageResize ) {
-                       # Check if the alt text is of the form "options|alt text"
-                       # Options are:
-                       #  * thumbnail          make a thumbnail with enlarge-icon and caption, alignment depends on lang
-                       #  * left               no resizing, just left align. label is used for alt= only
-                       #  * right              same, but right aligned
-                       #  * none               same, but not aligned
-                       #  * ___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 );
-                       $mwNone   =& MagicWord::get( MAG_IMG_NONE );
-                       $mwWidth  =& MagicWord::get( MAG_IMG_WIDTH );
-                       $mwCenter =& MagicWord::get( MAG_IMG_CENTER );
-                       $mwFramed =& MagicWord::get( MAG_IMG_FRAMED );
-                       $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';
-                               } elseif ( ! is_null( $mwLeft->matchVariableStartToEnd($val) ) ) {
-                                       # remember to set an alignment, don't render immediately
-                                       $align = 'left';
-                               } elseif ( ! is_null( $mwCenter->matchVariableStartToEnd($val) ) ) {
-                                       # remember to set an alignment, don't render immediately
-                                       $align = 'center';
-                               } elseif ( ! is_null( $mwNone->matchVariableStartToEnd($val) ) ) {
-                                       # remember to set an alignment, don't render immediately
-                                       $align = 'none';
-                               } elseif ( ! is_null( $match = $mwWidth->matchVariableStartToEnd($val) ) ) {
-                                       # $match is the image width in pixels
-                                       if ( preg_match( '/^([0-9]*)x([0-9]*)$/', $match, $m ) ) {
-                                               $width = intval( $m[1] );
-                                               $height = intval( $m[2] );
-                                       } else {
-                                               $width = intval($match);
-                                       }
-                               } elseif ( ! is_null( $mwFramed->matchVariableStartToEnd($val) ) ) {
-                                       $framed=true;
+               # Check if the alt text is of the form "options|alt text"
+               # Options are:
+               #  * thumbnail          make a thumbnail with enlarge-icon and caption, alignment depends on lang
+               #  * left               no resizing, just left align. label is used for alt= only
+               #  * right              same, but right aligned
+               #  * none               same, but not aligned
+               #  * ___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 );
+               $mwNone   =& MagicWord::get( MAG_IMG_NONE );
+               $mwWidth  =& MagicWord::get( MAG_IMG_WIDTH );
+               $mwCenter =& MagicWord::get( MAG_IMG_CENTER );
+               $mwFramed =& MagicWord::get( MAG_IMG_FRAMED );
+               $alt = '';
+
+               $height = $framed = $thumb = false;
+               $manual_thumb = "" ;
+
+               foreach( $part as $key => $val ) {
+                       $val_parts = explode ( "=" , $val , 2 ) ;
+                       $left_part = array_shift ( $val_parts ) ;
+                       if ( $wgUseImageResize && ! is_null( $mwThumb->matchVariableStartToEnd($val) ) ) {
+                               $thumb=true;
+                       } elseif ( $wgUseImageResize && 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';
+                       } elseif ( ! is_null( $mwLeft->matchVariableStartToEnd($val) ) ) {
+                               # remember to set an alignment, don't render immediately
+                               $align = 'left';
+                       } elseif ( ! is_null( $mwCenter->matchVariableStartToEnd($val) ) ) {
+                               # remember to set an alignment, don't render immediately
+                               $align = 'center';
+                       } elseif ( ! is_null( $mwNone->matchVariableStartToEnd($val) ) ) {
+                               # remember to set an alignment, don't render immediately
+                               $align = 'none';
+                       } elseif ( $wgUseImageResize && ! is_null( $match = $mwWidth->matchVariableStartToEnd($val) ) ) {
+                               # $match is the image width in pixels
+                               if ( preg_match( '/^([0-9]*)x([0-9]*)$/', $match, $m ) ) {
+                                       $width = intval( $m[1] );
+                                       $height = intval( $m[2] );
+                               } else {
+                                       $width = intval($match);
                                }
+                       } elseif ( ! is_null( $mwFramed->matchVariableStartToEnd($val) ) ) {
+                               $framed=true;
+                       } else {
+                               $alt = $val;
                        }
-                       if ( 'center' == $align )
-                       {
-                               $prefix  = '<span style="text-align: center">';
-                               $postfix = '</span>';
-                               $align   = 'none';
+               }
+               if ( 'center' == $align )
+               {
+                       $prefix  = '<div class="center">';
+                       $postfix = '</div>';
+                       $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
+                       # for right-to-left-languages ("Semitic languages")
+                       #
+                       # If  thumbnail width has not been provided, it is set
+                       # here to 180 pixels
+                       if ( $align == '' ) {
+                               $align = $wgContLang->isRTL() ? 'left' : 'right';
                        }
+                       if ( ! isset($width) ) {
+                               $width = 180;
+                       }
+                       return $prefix.$this->makeThumbLinkObj( $img, $alt, $align, $width, $height, $framed, $manual_thumb ).$postfix;
 
-                       if ( $thumb || $framed ) {
-
-                               # Create a thumbnail. Alignment depends on language
-                               # writing direction, # right aligned for left-to-right-
-                               # languages ("Western languages"), left-aligned
-                               # for right-to-left-languages ("Semitic languages")
-                               #
-                               # If  thumbnail width has not been provided, it is set
-                               # here to 180 pixels
-                               if ( $align == '' ) {
-                                       $align = $wgContLang->isRTL() ? 'left' : 'right';
-                               }
-                               if ( ! isset($width) ) {
-                                       $width = 180;
-                               }
-                               return $prefix.$this->makeThumbLinkObj( $img, $alt, $align, $width, $height, $framed, $manual_thumb ).$postfix;
-
-                       } elseif ( isset($width) ) {
+               } elseif ( isset($width) ) {
 
-                               # Create a resized image, without the additional thumbnail
-                               # features
+                       # Create a resized image, without the additional thumbnail
+                       # features
 
-                               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();
-                               }
-                               if ( '' == $manual_thumb ) $url = $img->createThumb( $width );
+                       if (    ( ! $height === false )
+                            && ( $img->getHeight() * $width / $img->getWidth() > $height ) ) {
+                               $width = $img->getWidth() * $height / $img->getHeight();
                        }
-               } # endif $wgUseImageResize
-
-               if ( empty( $alt ) ) {
-                       $alt = preg_replace( '/\.(.+?)^/', '', $img->getName() );
+                       if ( '' == $manual_thumb ) $url = $img->createThumb( $width );
                }
-               $alt = htmlspecialchars( $alt );
+
+               $alt = preg_replace( '/<[^>]*>/', '', $alt );
+               $alt = preg_replace('/&(?!:amp;|#[Xx][0-9A-fa-f]+;|#[0-9]+;|[a-zA-Z0-9]+;)/', '&amp;', $alt);
+               $alt = str_replace( array('<', '>', '"'), array('&lt;', '&gt;', '&quot;'), $alt );
 
                $u = $nt->escapeLocalURL();
-               if ( $url == '' )
-               {
+               if ( $url == '' ) {
                        $s = wfMsg( 'missingimage', $img->getName() );
                        $s .= "<br>{$alt}<br>{$url}<br>\n";
                } else {
                        $s = '<a href="'.$u.'" class="image" title="'.$alt.'">' .
-                                '<img src="'.$url.'" alt="'.$alt.'" /></a>';
+                                '<img src="'.$url.'" alt="'.$alt.'" longdesc="'.$u.'" /></a>';
                }
                if ( '' != $align ) {
                        $s = "<div class=\"float{$align}\"><span>{$s}</span></div>";
@@ -1975,11 +1813,12 @@ class Skin {
        function makeThumbLinkObj( $img, $label = '', $align = 'right', $boxwidth = 180, $boxheight=false, $framed=false , $manual_thumb = "" ) {
                global $wgStylePath, $wgContLang;
                # $image = Title::makeTitleSafe( NS_IMAGE, $name );
-               $url  = $img->getURL();
+               $url  = $img->getViewURL();
 
                #$label = htmlspecialchars( $label );
                $alt = preg_replace( '/<[^>]*>/', '', $label);
-               $alt = htmlspecialchars( $alt );
+               $alt = preg_replace('/&(?!:amp;|#[Xx][0-9A-fa-f]+;|#[0-9]+;|[a-zA-Z0-9]+;)/', '&amp;', $alt);
+               $alt = str_replace( array('<', '>', '"'), array('&lt;', '&gt;', '&quot;'), $alt );
 
                $width = $height = 0;
                if ( $img->exists() )
@@ -2018,7 +1857,7 @@ class Skin {
                {
                        $manual_title = Title::makeTitleSafe( NS_IMAGE, $manual_thumb ); #new Title ( $manual_thumb ) ;
                        $manual_img = Image::newFromTitle( $manual_title );
-                       $thumbUrl = $manual_img->getURL();
+                       $thumbUrl = $manual_img->getViewURL();
                        if ( $manual_img->exists() )
                        {
                                $width  = $manual_img->getWidth();
@@ -2042,7 +1881,8 @@ class Skin {
                } else {
                        $s .= '<a href="'.$u.'" class="internal" title="'.$alt.'">'.
                                '<img src="'.$thumbUrl.'" alt="'.$alt.'" ' .
-                               'width="'.$boxwidth.'" height="'.$boxheight.'" /></a>';
+                               'width="'.$boxwidth.'" height="'.$boxheight.'" ' .
+                               'longdesc="'.$u.'" /></a>';
                        if ( $framed ) {
                                $zoomicon="";
                        } else {
@@ -2057,24 +1897,29 @@ class Skin {
        }
 
        function makeMediaLink( $name, $url, $alt = '' ) {
-               $nt = Title::makeTitleSafe( Namespace::getMedia(), $name );
+               $nt = Title::makeTitleSafe( NS_IMAGE, $name );
                return $this->makeMediaLinkObj( $nt, $alt );
        }
 
-       function makeMediaLinkObj( $nt, $alt = '' ) {
+       function makeMediaLinkObj( $nt, $alt = '', $nourl=false ) {             
                if ( ! isset( $nt ) )
                {
                        ### HOTFIX. Instead of breaking, return empty string.
                        $s = $alt;
                } else {
-                       $name = $nt->getDBKey();
-                       $url = Image::wfImageUrl( $name );
+                       $name = $nt->getDBKey();        
+                       $img   = Image::newFromTitle( $nt );
+                       $url = $img->getURL();
+                       # $nourl can be set by the parser
+                       # this is a hack to mask absolute URLs, so the parser doesn't
+                       # linkify them (it is currently not context-aware)
+                       # 2004-10-25
+                       if ($nourl) { $url=str_replace("http://","http-noparse://",$url) ; }
                        if ( empty( $alt ) ) {
                                $alt = preg_replace( '/\.(.+?)^/', '', $name );
                        }
-
                        $u = htmlspecialchars( $url );
-                       $s = "<a href=\"{$u}\" class='internal' title=\"{$alt}\">{$alt}</a>";
+                       $s = "<a href=\"{$u}\" class='internal' title=\"{$alt}\">{$alt}</a>";                   
                }
                return $s;
        }
@@ -2097,490 +1942,6 @@ class Skin {
                return '<a href="'.$url.'"'.$style.'>'.$text.'</a>';
        }
 
-       # Called by history lists and recent changes
-       #
-
-       # Returns text for the start of the tabular part of RC
-       function beginRecentChangesList() {
-               $this->rc_cache = array() ;
-               $this->rcMoveIndex = 0;
-               $this->rcCacheIndex = 0 ;
-               $this->lastdate = '';
-               $this->rclistOpen = false;
-               return '';
-       }
-
-       function beginImageHistoryList() {
-               $s = "\n<h2>" . wfMsg( 'imghistory' ) . "</h2>\n" .
-                 "<p>" . wfMsg( 'imghistlegend' ) . "</p>\n".'<ul class="special">';
-               return $s;
-       }
-
-       /**
-        * Returns text for the end of RC
-        * If enhanced RC is in use, returns pretty much all the text
-        */
-       function endRecentChangesList() {
-               $s = $this->recentChangesBlock() ;
-               if( $this->rclistOpen ) {
-                       $s .= "</ul>\n";
-               }
-               return $s;
-       }
-
-       /**
-        * Enhanced RC ungrouped line
-        */
-       function recentChangesBlockLine ( $rcObj ) {
-               global $wgStylePath, $wgContLang ;
-
-               # Get rc_xxxx variables
-               extract( $rcObj->mAttribs ) ;
-               $curIdEq = 'curid='.$rc_cur_id;
-
-               # Spacer image
-               $r = '' ;
-
-               $r .= '<img src="'.$wgStylePath.'/common/images/Arr_.png" width="12" height="12" border="0" />' ;
-               $r .= '<tt>' ;
-
-               if ( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
-                       $r .= '&nbsp;&nbsp;';
-               } else {
-                       # M & N (minor & new)
-                       $M = wfMsg( 'minoreditletter' );
-                       $N = wfMsg( 'newpageletter' );
-
-                       if ( $rc_type == RC_NEW ) {
-                               $r .= $N ;
-                       } else {
-                               $r .= '&nbsp;' ;
-                       }
-                       if ( $rc_minor ) {
-                               $r .= $M ;
-                       } else {
-                               $r .= '&nbsp;' ;
-                       }
-               }
-
-               # Timestamp
-               $r .= ' '.$rcObj->timestamp.' ' ;
-               $r .= '</tt>' ;
-
-               # Article link
-               $link = $rcObj->link ;
-               if ( $rcObj->watched ) $link = '<strong>'.$link.'</strong>' ;
-               $r .= $link ;
-
-               # Diff
-               $r .= ' (' ;
-               $r .= $rcObj->difflink ;
-               $r .= '; ' ;
-
-               # Hist
-               $r .= $this->makeKnownLinkObj( $rcObj->getTitle(), wfMsg( 'hist' ), $curIdEq.'&action=history' );
-
-               # User/talk
-               $r .= ') . . '.$rcObj->userlink ;
-               $r .= $rcObj->usertalklink ;
-
-               # Comment
-                if ( $rc_comment != '' && $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) {
-                       $rc_comment=$this->formatComment($rc_comment, $rcObj->getTitle());
-                       $r .= $wgContLang->emphasize( ' ('.$rc_comment.')' );
-               }
-
-               $r .= "<br />\n" ;
-               return $r ;
-       }
-
-       /**
-        * Enhanced RC group
-        */
-       function recentChangesBlockGroup ( $block ) {
-               global $wgStylePath, $wgContLang ;
-
-               $r = '' ;
-               $M = wfMsg( 'minoreditletter' );
-               $N = wfMsg( 'newpageletter' );
-
-               # Collate list of users
-               $isnew = false ;
-               $userlinks = array () ;
-               foreach ( $block AS $rcObj ) {
-                       $oldid = $rcObj->mAttribs['rc_last_oldid'];
-                       if ( $rcObj->mAttribs['rc_new'] ) $isnew = true ;
-                       $u = $rcObj->userlink ;
-                       if ( !isset ( $userlinks[$u] ) ) $userlinks[$u] = 0 ;
-                       $userlinks[$u]++ ;
-               }
-
-               # Sort the list and convert to text
-               krsort ( $userlinks ) ;
-               asort ( $userlinks ) ;
-               $users = array () ;
-               foreach ( $userlinks as $userlink => $count) {
-                       $text = $userlink ;
-                       if ( $count > 1 ) $text .= " ({$count}&times;)" ;
-                       array_push ( $users , $text ) ;
-               }
-               $users = ' <font size="-1">['.implode('; ',$users).']</font>' ;
-
-               # Arrow
-               $rci = 'RCI'.$this->rcCacheIndex ;
-               $rcl = 'RCL'.$this->rcCacheIndex ;
-               $rcm = 'RCM'.$this->rcCacheIndex ;
-               $toggleLink = "javascript:toggleVisibility('$rci','$rcm','$rcl')" ;
-               $arrowdir = $wgContLang->isRTL() ? 'l' : 'r';
-               $tl  = '<span id="'.$rcm.'"><a href="'.$toggleLink.'"><img src="'.$wgStylePath.'/common/images/Arr_'.$arrowdir.'.png" width="12" height="12" /></a></span>' ;
-               $tl .= '<span id="'.$rcl.'" style="display:none"><a href="'.$toggleLink.'"><img src="'.$wgStylePath.'/common/images/Arr_d.png" width="12" height="12" /></a></span>' ;
-               $r .= $tl ;
-
-               # Main line
-               # M/N
-               $r .= '<tt>' ;
-               if ( $isnew ) $r .= $N ;
-               else $r .= '&nbsp;' ;
-               $r .= '&nbsp;' ; # Minor
-
-               # Timestamp
-               $r .= ' '.$block[0]->timestamp.' ' ;
-               $r .= '</tt>' ;
-
-               # Article link
-               $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') ,
-                               $curIdEq.'&diff=0&oldid='.$oldid ) ;
-                       $r .= '; ' ;
-
-                       # History
-                       $r .= $this->makeKnownLinkObj( $block[0]->getTitle(), wfMsg( 'history' ), $curIdEq.'&action=history' );
-                       $r .= ')' ;
-               }
-
-               $r .= $users ;
-               $r .= "<br />\n" ;
-
-               # Sub-entries
-               $r .= '<div id="'.$rci.'" style="display:none">' ;
-               foreach ( $block AS $rcObj ) {
-                       # Get rc_xxxx variables
-                       extract( $rcObj->mAttribs );
-
-                       $r .= '<img src="'.$wgStylePath.'/common/images/Arr_.png" width="12" height="12" />';
-                       $r .= '<tt>&nbsp; &nbsp; &nbsp; &nbsp;' ;
-                       if ( $rc_new ) $r .= $N ;
-                       else $r .= '&nbsp;' ;
-                       if ( $rc_minor ) $r .= $M ;
-                       else $r .= '&nbsp;' ;
-                       $r .= '</tt>' ;
-
-                       $o = '' ;
-                       if ( $rc_last_oldid != 0 ) {
-                               $o = 'oldid='.$rc_last_oldid ;
-                       }
-                       if ( $rc_type == RC_LOG ) {
-                               $link = $rcObj->timestamp ;
-                       } else {
-                               $link = $this->makeKnownLinkObj( $rcObj->getTitle(), $rcObj->timestamp , "{$curIdEq}&$o" ) ;
-                       }
-                       $link = '<tt>'.$link.'</tt>' ;
-
-                       $r .= $link ;
-                       $r .= ' (' ;
-                       $r .= $rcObj->curlink ;
-                       $r .= '; ' ;
-                       $r .= $rcObj->lastlink ;
-                       $r .= ') . . '.$rcObj->userlink ;
-                       $r .= $rcObj->usertalklink ;
-                       if ( $rc_comment != '' ) {
-                               $rc_comment=$this->formatComment($rc_comment, $rcObj->getTitle());
-                               $r .= $wgContLang->emphasize( ' ('.$rc_comment.')' ) ;
-                       }
-                       $r .= "<br />\n" ;
-               }
-               $r .= "</div>\n" ;
-
-               $this->rcCacheIndex++ ;
-               return $r ;
-       }
-
-       /**
-        * If enhanced RC is in use, this function takes the previously cached
-        * RC lines, arranges them, and outputs the HTML
-        */
-       function recentChangesBlock () {
-               global $wgStylePath ;
-               if ( count ( $this->rc_cache ) == 0 ) return '' ;
-               $blockOut = '';
-               foreach ( $this->rc_cache AS $secureName => $block ) {
-                       if ( count ( $block ) < 2 ) {
-                               $blockOut .= $this->recentChangesBlockLine ( array_shift ( $block ) ) ;
-                       } else {
-                               $blockOut .= $this->recentChangesBlockGroup ( $block ) ;
-                       }
-               }
-
-               return '<div>'.$blockOut.'</div>' ;
-       }
-
-       /**
-        * Called in a loop over all displayed RC entries
-        * Either returns the line, or caches it for later use
-        */
-       function recentChangesLine( &$rc, $watched = false ) {
-               global $wgUser ;
-               $usenew = $wgUser->getOption( 'usenewrc' );
-               if ( $usenew )
-                       $line = $this->recentChangesLineNew ( $rc, $watched ) ;
-               else
-                       $line = $this->recentChangesLineOld ( $rc, $watched ) ;
-               return $line ;
-       }
-
-       function recentChangesLineOld( &$rc, $watched = false ) {
-               global $wgTitle, $wgLang, $wgContLang, $wgUser, $wgRCSeconds, $wgUseRCPatrol, $wgOnlySysopsCanPatrol;
-
-               # Extract DB fields into local scope
-               extract( $rc->mAttribs );
-               $curIdEq = 'curid=' . $rc_cur_id;
-
-               # Make date header if necessary
-               $date = $wgContLang->date( $rc_timestamp, true);
-               $uidate = $wgLang->date( $rc_timestamp, true);
-               $s = '';
-               if ( $date != $this->lastdate ) {
-                       if ( '' != $this->lastdate ) { $s .= "</ul>\n"; }
-                       $s .= "<h4>{$uidate}</h4>\n<ul class='special'>";
-                       $this->lastdate = $date;
-                       $this->rclistOpen = true;
-               }
-
-               # 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]]"
-                       $msg = ( $rc_type == RC_MOVE ) ? '1movedto2' : '1movedto2_redir';
-                       $s .= wfMsg( $msg, $this->makeKnownLinkObj( $rc->getTitle(), '', 'redirect=no' ),
-                               $this->makeKnownLinkObj( $rc->getMovedToTitle(), '' ) );
-               } elseif( $rc_namespace == NS_SPECIAL && preg_match( '!^Log/(.*)$!', $rc_title, $matches ) ) {
-                       # Log updates, etc
-                       $logtype = $matches[1];
-                       $logname = LogPage::logName( $logtype );
-                       $s .= '(' . $this->makeKnownLinkObj( $rc->getTitle(), $logname ) . ')';
-               } 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}{$rcidparam}",
-                                 '', '', ' tabindex="'.$rc->counter.'"');
-                       }
-                       $s .= '('.$diffLink.') (';
-
-                       # History link
-                       $s .= $this->makeKnownLinkObj( $rc->getTitle(), wfMsg( 'hist' ), $curIdEq.'&action=history' );
-                       $s .= ') . . ';
-
-                       # M and N (minor and new)
-                       if ( $rc_minor ) { $s .= ' <span class="minor">'.wfMsg( "minoreditletter" ).'</span>'; }
-                       if ( $rc_type == RC_NEW ) { $s .= '<span class="newpage">'.wfMsg( "newpageletter" ).'</span>'; }
-
-                       # Article link
-                       # 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>';
-                       }
-                       $s .= ' '.$articleLink;
-
-               }
-
-               # Timestamp
-               $s .= '; ' . $wgLang->time( $rc_timestamp, true, $wgRCSeconds ) . ' . . ';
-
-               # User link (or contributions for unregistered users)
-               if ( 0 == $rc_user ) {
-                       $userLink = $this->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
-                       $rc_user_text, 'target=' . $rc_user_text );
-               } else {
-                       $userLink = $this->makeLink( $wgContLang->getNsText( NS_USER ) . ':'.$rc_user_text, $rc_user_text );
-               }
-               $s .= $userLink;
-
-               # User talk link
-               $talkname=$wgContLang->getNsText(NS_TALK); # use the shorter name
-               global $wgDisableAnonTalk;
-               if( 0 == $rc_user && $wgDisableAnonTalk ) {
-                       $userTalkLink = '';
-               } else {
-                       $utns=$wgContLang->getNsText(NS_USER_TALK);
-                       $userTalkLink= $this->makeLink($utns . ':'.$rc_user_text, $talkname );
-               }
-               # Block link
-               $blockLink='';
-               if ( ( 0 == $rc_user ) && $wgUser->isSysop() ) {
-                       $blockLink = $this->makeKnownLink( $wgContLang->specialPage(
-                         'Blockip' ), wfMsg( 'blocklink' ), 'ip='.$rc_user_text );
-
-               }
-               if($blockLink) {
-                       if($userTalkLink) $userTalkLink .= ' | ';
-                       $userTalkLink .= $blockLink;
-               }
-               if($userTalkLink) $s.=' ('.$userTalkLink.')';
-
-               # Add comment
-               if ( '' != $rc_comment && '*' != $rc_comment && $rc_type != RC_MOVE && $rc_type != RC_MOVE_OVER_REDIRECT ) {
-                       $rc_comment=$this->formatComment($rc_comment,$rc->getTitle());
-                       $s .= $wgContLang->emphasize(' (' . $rc_comment . ')');
-               }
-               $s .= "</li>\n";
-
-               return $s;
-       }
-
-       function recentChangesLineNew( &$baseRC, $watched = false ) {
-               global $wgTitle, $wgLang, $wgContLang, $wgUser, $wgRCSeconds;
-
-               # Create a specialised object
-               $rc = RCCacheEntry::newFromParent( $baseRC ) ;
-
-               # Extract fields from DB into the function scope (rc_xxxx variables)
-               extract( $rc->mAttribs );
-               $curIdEq = 'curid=' . $rc_cur_id;
-
-               # If it's a new day, add the headline and flush the cache
-               $date = $wgContLang->date( $rc_timestamp, true);
-               $uidate = $wgLang->date( $rc_timestamp, true);
-               $ret = '';
-               if ( $date != $this->lastdate ) {
-                       # Process current cache
-                       $ret = $this->recentChangesBlock () ;
-                       $this->rc_cache = array() ;
-                       $ret .= "<h4>{$uidate}</h4>\n";
-                       $this->lastdate = $date;
-               }
-
-               # Make article link
-               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(), '' ) );
-               } elseif( $rc_namespace == NS_SPECIAL && preg_match( '!^Log/(.*)$!', $rc_title, $matches ) ) {
-                       # Log updates, etc
-                       $logtype = $matches[1];
-                       $logname = LogPage::logName( $logtype );
-                       $clink = '(' . $this->makeKnownLinkObj( $rc->getTitle(), $logname ) . ')';
-               } else {
-                       $clink = $this->makeKnownLinkObj( $rc->getTitle(), '' ) ;
-               }
-
-               $time = $wgContLang->time( $rc_timestamp, true, $wgRCSeconds );
-               $rc->watched = $watched ;
-               $rc->link = $clink ;
-               $rc->timestamp = $time;
-
-               # 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 {
-                       $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 || $rc_type == RC_MOVE_OVER_REDIRECT ) {
-                       $lastLink = wfMsg( 'last' );
-               } else {
-                       $lastLink = $this->makeKnownLinkObj( $rc->getTitle(), wfMsg( 'last' ),
-                         $curIdEq.'&diff='.$rc_this_oldid.'&oldid='.$rc_last_oldid );
-               }
-
-               # Make user link (or user contributions for unregistered users)
-               if ( $rc_user == 0 ) {
-                       $userLink = $this->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
-                       $rc_user_text, 'target=' . $rc_user_text );
-               } else {
-                       $userLink = $this->makeLink( $wgContLang->getNsText(
-                         Namespace::getUser() ) . ':'.$rc_user_text, $rc_user_text );
-               }
-
-               $rc->userlink = $userLink;
-               $rc->lastlink = $lastLink;
-               $rc->curlink  = $curLink;
-               $rc->difflink = $diffLink;
-
-               # Make user talk link
-               $utns=$wgContLang->getNsText(NS_USER_TALK);
-               $talkname=$wgContLang->getNsText(NS_TALK); # use the shorter name
-               $userTalkLink= $this->makeLink($utns . ':'.$rc_user_text, $talkname );
-
-               global $wgDisableAnonTalk;
-               if ( ( 0 == $rc_user ) && $wgUser->isSysop() ) {
-                       $blockLink = $this->makeKnownLink( $wgContLang->specialPage(
-                         'Blockip' ), wfMsg( 'blocklink' ), 'ip='.$rc_user_text );
-                       if( $wgDisableAnonTalk )
-                               $rc->usertalklink = ' ('.$blockLink.')';
-                       else
-                               $rc->usertalklink = ' ('.$userTalkLink.' | '.$blockLink.')';
-               } else {
-                       if( $wgDisableAnonTalk && ($rc_user == 0) )
-                               $rc->usertalklink = '';
-                       else
-                               $rc->usertalklink = ' ('.$userTalkLink.')';
-               }
-
-               # Put accumulated information into the cache, for later display
-               # Page moves go on their own line
-               $title = $rc->getTitle();
-               $secureName = $title->getPrefixedDBkey();
-               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 {
-                       if ( !isset ( $this->rc_cache[$secureName] ) ) $this->rc_cache[$secureName] = array() ;
-                       array_push ( $this->rc_cache[$secureName] , $rc ) ;
-               }
-               return $ret;
-       }
-
-       function endImageHistoryList() {
-               $s = "</ul>\n";
-               return $s;
-       }
-
        /**
         * This function is called by all recent changes variants, by the page history,
         * and by the user contributions list. It is responsible for formatting edit
@@ -2596,6 +1957,9 @@ class Skin {
         * temporarily to a value pass. Should be adjusted further. --brion
         */
        function formatComment($comment, $title = NULL) {
+               $fname = 'Skin::formatComment';
+               wfProfileIn( $fname );
+               
                global $wgContLang;
                $comment = htmlspecialchars( $comment );
 
@@ -2653,65 +2017,10 @@ class Skin {
                        }
                        $comment = preg_replace( $linkRegexp, $thelink, $comment, 1 );
                }
+               wfProfileOut( $fname );
                return $comment;
        }
-
-       function imageHistoryLine( $iscur, $timestamp, $img, $user, $usertext, $size, $description ) {
-               global $wgUser, $wgLang, $wgContLang, $wgTitle;
-
-               $datetime = $wgLang->timeanddate( $timestamp, true );
-               $del = wfMsg( 'deleteimg' );
-               $delall = wfMsg( 'deleteimgcompletely' );
-               $cur = wfMsg( 'cur' );
-
-               if ( $iscur ) {
-                       $url = Image::wfImageUrl( $img );
-                       $rlink = $cur;
-                       if ( $wgUser->isSysop() ) {
-                               $link = $wgTitle->escapeLocalURL( 'image=' . $wgTitle->getPartialURL() .
-                                 '&action=delete' );
-                               $style = $this->getInternalLinkAttributes( $link, $delall );
-
-                               $dlink = '<a href="'.$link.'"'.$style.'>'.$delall.'</a>';
-                       } else {
-                               $dlink = $del;
-                       }
-               } else {
-                       $url = htmlspecialchars( wfImageArchiveUrl( $img ) );
-                       if( $wgUser->getID() != 0 && $wgTitle->userCanEdit() ) {
-                               $rlink = $this->makeKnownLink( $wgTitle->getPrefixedText(),
-                                          wfMsg( 'revertimg' ), 'action=revert&oldimage=' .
-                                          urlencode( $img ) );
-                               $dlink = $this->makeKnownLink( $wgTitle->getPrefixedText(),
-                                          $del, 'action=delete&oldimage=' . urlencode( $img ) );
-                       } else {
-                               # Having live active links for non-logged in users
-                               # means that bots and spiders crawling our site can
-                               # inadvertently change content. Baaaad idea.
-                               $rlink = wfMsg( 'revertimg' );
-                               $dlink = $del;
-                       }
-               }
-               if ( 0 == $user ) {
-                       $userlink = $usertext;
-               } else {
-                       $userlink = $this->makeLink( $wgContLang->getNsText( Namespace::getUser() ) .
-                                      ':'.$usertext, $usertext );
-               }
-               $nbytes = wfMsg( 'nbytes', $size );
-               $style = $this->getInternalLinkAttributes( $url, $datetime );
-
-               $s = "<li> ({$dlink}) ({$rlink}) <a href=\"{$url}\"{$style}>{$datetime}</a>"
-                 . " . . {$userlink} ({$nbytes})";
-
-               if ( '' != $description && '*' != $description ) {
-                       $sk=$wgUser->getSkin();
-                       $s .= $wgContLang->emphasize(' (' . $sk->formatComment($description,$wgTitle) . ')');
-               }
-               $s .= "</li>\n";
-               return $s;
-       }
-
+       
        function tocIndent($level) {
                return str_repeat( '<div class="tocindent">'."\n", $level>0 ? $level : 0 );
        }
@@ -2739,7 +2048,7 @@ class Skin {
                $hideline = ' <script type="text/javascript">showTocToggle("' . addslashes( wfMsg('showtoc') ) . '","' . addslashes( wfMsg('hidetoc') ) . '")</script>';
                return
                '<table border="0" id="toc"><tr id="toctitle"><td align="center">'."\n".
-               '<b>'.wfMsg('toc').'</b>' .
+               '<b>'.wfMsgForContent('toc').'</b>' .
                $hideline .
                '</td></tr><tr id="tocinside"><td>'."\n".
                $toc."</td></tr></table>\n";
@@ -2755,18 +2064,18 @@ class Skin {
                return '<span oncontextmenu=\'document.location="'.$url.'";return false;\'>'.$head.'</span>';
        }
 
-       function editSectionScript( $section, $head ) {
-               global $wgTitle, $wgRequest;
+       function editSectionScript( $nt, $section, $head ) {
+               global $wgRequest;
                if( $wgRequest->getInt( 'oldid' ) && ( $wgRequest->getVal( 'diff' ) != '0' ) ) {
                        return $head;
                }
-               $url = $wgTitle->escapeLocalURL( 'action=edit&section='.$section );
+               $url = $nt->escapeLocalURL( 'action=edit&section='.$section );
                return '<span oncontextmenu=\'document.location="'.$url.'";return false;\'>'.$head.'</span>';
        }
 
        function editSectionLinkForOther( $title, $section ) {
                global $wgRequest;
-               global $wgUser, $wgContLang;
+               global $wgContLang;
 
                $title = Title::newFromText($title);
                $editurl = '&section='.$section;
@@ -2783,9 +2092,9 @@ class Skin {
 
        }
 
-       function editSectionLink( $section ) {
+       function editSectionLink( $nt, $section ) {
                global $wgRequest;
-               global $wgTitle, $wgUser, $wgContLang;
+               global $wgContLang;
 
                if( $wgRequest->getInt( 'oldid' ) && ( $wgRequest->getVal( 'diff' ) != '0' ) ) {
                        # Section edit links would be out of sync on an old page.
@@ -2795,7 +2104,7 @@ class Skin {
                }
 
                $editurl = '&section='.$section;
-               $url = $this->makeKnownLink($wgTitle->getPrefixedText(),wfMsg('editsection'),'action=edit'.$editurl);
+               $url = $this->makeKnownLink($nt->getPrefixedText(),wfMsg('editsection'),'action=edit'.$editurl);
 
                if( $wgContLang->isRTL() ) {
                        $farside = 'left';
@@ -2808,133 +2117,6 @@ class Skin {
 
        }
 
-       /**
-        * This function is called by EditPage.php and shows a bulletin board style
-        * toolbar for common editing functions. It can be disabled in the user
-        * preferences.
-        * The necessary JavaScript code can be found in style/wikibits.js.
-        */
-       function getEditToolbar() {
-               global $wgStylePath, $wgLang, $wgMimeType;
-
-               /**
-                * toolarray an array of arrays which each include the filename of
-                * the button image (without path), the opening tag, the closing tag,
-                * and optionally a sample text that is inserted between the two when no
-                * selection is highlighted.
-                * The tip text is shown when the user moves the mouse over the button.
-                *
-                * Already here are accesskeys (key), which are not used yet until someone
-                * can figure out a way to make them work in IE. However, we should make
-                * sure these keys are not defined on the edit page.
-                */
-               $toolarray=array(
-                       array(  'image'=>'button_bold.png',
-                                       'open'  =>      "\'\'\'",
-                                       'close' =>      "\'\'\'",
-                                       'sample'=>      wfMsg('bold_sample'),
-                                       'tip'   =>      wfMsg('bold_tip'),
-                                       'key'   =>      'B'
-                               ),
-                       array(  'image'=>'button_italic.png',
-                                       'open'  =>      "\'\'",
-                                       'close' =>      "\'\'",
-                                       'sample'=>      wfMsg('italic_sample'),
-                                       'tip'   =>      wfMsg('italic_tip'),
-                                       'key'   =>      'I'
-                               ),
-                       array(  'image'=>'button_link.png',
-                                       'open'  =>      '[[',
-                                       'close' =>      ']]',
-                                       'sample'=>      wfMsg('link_sample'),
-                                       'tip'   =>      wfMsg('link_tip'),
-                                       'key'   =>      'L'
-                               ),
-                       array(  'image'=>'button_extlink.png',
-                                       'open'  =>      '[',
-                                       'close' =>      ']',
-                                       'sample'=>      wfMsg('extlink_sample'),
-                                       'tip'   =>      wfMsg('extlink_tip'),
-                                       'key'   =>      'X'
-                               ),
-                       array(  'image'=>'button_headline.png',
-                                       'open'  =>      "\\n== ",
-                                       'close' =>      " ==\\n",
-                                       'sample'=>      wfMsg('headline_sample'),
-                                       'tip'   =>      wfMsg('headline_tip'),
-                                       'key'   =>      'H'
-                               ),
-                       array(  'image'=>'button_image.png',
-                                       'open'  =>      '[['.$wgLang->getNsText(NS_IMAGE).":",
-                                       'close' =>      ']]',
-                                       'sample'=>      wfMsg('image_sample'),
-                                       'tip'   =>      wfMsg('image_tip'),
-                                       'key'   =>      'D'
-                               ),
-                       array(  'image' =>      'button_media.png',
-                                       'open'  =>      '[['.$wgLang->getNsText(NS_MEDIA).':',
-                                       'close' =>      ']]',
-                                       'sample'=>      wfMsg('media_sample'),
-                                       'tip'   =>      wfMsg('media_tip'),
-                                       'key'   =>      'M'
-                               ),
-                       array(  'image' =>      'button_math.png',
-                                       'open'  =>      "\\<math\\>",
-                                       'close' =>      "\\</math\\>",
-                                       'sample'=>      wfMsg('math_sample'),
-                                       'tip'   =>      wfMsg('math_tip'),
-                                       'key'   =>      'C'
-                               ),
-                       array(  'image' =>      'button_nowiki.png',
-                                       'open'  =>      "\\<nowiki\\>",
-                                       'close' =>      "\\</nowiki\\>",
-                                       'sample'=>      wfMsg('nowiki_sample'),
-                                       'tip'   =>      wfMsg('nowiki_tip'),
-                                       'key'   =>      'N'
-                               ),
-                       array(  'image' =>      'button_sig.png',
-                                       'open'  =>      '--~~~~',
-                                       'close' =>      '',
-                                       'sample'=>      '',
-                                       'tip'   =>      wfMsg('sig_tip'),
-                                       'key'   =>      'Y'
-                               ),
-                       array(  'image' =>      'button_hr.png',
-                                       'open'  =>      "\\n----\\n",
-                                       'close' =>      '',
-                                       'sample'=>      '',
-                                       'tip'   =>      wfMsg('hr_tip'),
-                                       'key'   =>      'R'
-                               )
-               );
-               $toolbar ="<script type='text/javascript'>\n/*<![CDATA[*/\n";
-
-               $toolbar.="document.writeln(\"<div id='toolbar'>\");\n";
-               foreach($toolarray as $tool) {
-
-                       $image=$wgStylePath.'/common/images/'.$tool['image'];
-                       $open=$tool['open'];
-                       $close=$tool['close'];
-                       $sample = addslashes( $tool['sample'] );
-
-                       // Note that we use the tip both for the ALT tag and the TITLE tag of the image.
-                       // Older browsers show a "speedtip" type message only for ALT.
-                       // Ideally these should be different, realistically they
-                       // probably don't need to be.
-                       $tip = addslashes( $tool['tip'] );
-
-                       #$key = $tool["key"];
-
-                       $toolbar.="addButton('$image','$tip','$open','$close','$sample');\n";
-               }
-
-               $toolbar.="addInfobox('" . addslashes( wfMsg( "infobox" ) ) . "','" . addslashes(wfMsg("infobox_alert")) . "');\n";
-               $toolbar.="document.writeln(\"</div>\");\n";
-
-               $toolbar.="/*]]>*/\n</script>";
-               return $toolbar;
-       }
-
        /**
         * @access public
         */