X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSkin.php;h=bdd40ca2c954e33aa0d52f82c69f1f62a89fec3d;hb=e56ab3154a52842eb8e4b235aa2aa5dfa5599c99;hp=482513c88c6a33e3bf4c7cea3c548984ac1cfe97;hpb=da056c312e5758f2ec22e51c70ecf71c10dc4522;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Skin.php b/includes/Skin.php
index 482513c88c..bdd40ca2c9 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -3,6 +3,7 @@
 /**
  *
  * @package MediaWiki
+ * @subpackage Skins
  */
 
 /**
@@ -10,30 +11,10 @@
  */
 if( defined( "MEDIAWIKI" ) ) {
 
-# See skin.doc
+# See skin.txt
+require_once( 'Linker.php' );
 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 +24,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();
@@ -53,17 +34,6 @@ unset($matches);
 
 require_once( 'RecentChange.php' );
 
-global $wgLinkHolders;
-$wgLinkHolders = array(
-	'namespaces' => array(),
-	'dbkeys' => array(),
-	'queries' => array(),
-	'texts' => array(),
-	'titles' => array()
-);
-global $wgInterwikiLinkHolders;
-$wgInterwikiLinkHolders = array();
-
 /**
  * @todo document
  * @package MediaWiki
@@ -90,42 +60,32 @@ class RCCacheEntry extends RecentChange
  * This base class is also the "Standard" skin.
  * @package MediaWiki
  */
-class Skin {
+class Skin extends Linker {
 	/**#@+
 	 * @access private
 	 */
 	var $lastdate, $lastline;
-	var $linktrail ; # linktrail regexp
 	var $rc_cache ; # Cache for Enhanced Recent Changes
 	var $rcCacheIndex ; # Recent Changes Cache Counter for visibility toggle
 	var $rcMoveIndex;
-	var $postParseLinkColour = false;
 	/**#@-*/
 
-	function Skin() {
-		$this->linktrail = wfMsg('linktrail');
-	}
+	/** Constructor, call parent constructor */
+	function Skin() { parent::Linker(); }
 
 	function getSkinNames() {
 		global $wgValidSkinNames;
 		return $wgValidSkinNames;
 	}
 
-	function getStylesheet() {
-		return 'common/wikistandard.css';
-	}
+	/** @return string path to the skin stylesheet */
+	function getStylesheet() { return 'common/wikistandard.css'; }
 
+	/** @return string skin name */
 	function getSkinName() {
 		return 'standard';
 	}
 
-	/**
-	 * Get/set accessor for delayed link colouring
-	 */
-	function postParseLinkColour( $setting = NULL ) {
-		return wfSetVar( $this->postParseLinkColour, $setting );
-	}
-
 	function qbSetting() {
 		global $wgOut, $wgUser;
 
@@ -212,16 +172,42 @@ class Skin {
 	}
 
 	function getHeadScripts() {
-		global $wgStylePath, $wgUser, $wgContLang, $wgAllowUserJs;
-		$r = "<script type=\"text/javascript\" src=\"{$wgStylePath}/common/wikibits.js\"></script>\n";
-		if( $wgAllowUserJs && $wgUser->getID() != 0 ) { # logged in
-			$userpage = $wgContLang->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";
+		global $wgStylePath, $wgUser, $wgContLang, $wgAllowUserJs, $wgJsMimeType;
+		$r = "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js\"></script>\n";
+		if( $wgAllowUserJs && $wgUser->isLoggedIn() ) {
+			$userpage = $wgUser->getUserPage();
+			$userjs = htmlspecialchars( $this->makeUrl(
+				$userpage->getPrefixedText().'/'.$this->getSkinName().'.js',
+				'action=raw&ctype='.$wgJsMimeType));
+			$r .= '<script type="'.$wgJsMimeType.'" src="'.$userjs."\"></script>\n";
 		}
 		return $r;
 	}
 
+	/**
+	 * To make it harder for someone to slip a user a fake
+	 * user-JavaScript or user-CSS preview, a random token
+	 * is associated with the login session. If it's not
+	 * passed back with the preview request, we won't render
+	 * the code.
+	 *
+	 * @param string $action
+	 * @return bool
+	 * @access private
+	 */
+	function userCanPreview( $action ) {
+		global $wgTitle, $wgRequest, $wgUser;
+		
+		if( $action != 'submit' )
+			return false;
+		if( !$wgRequest->wasPosted() )
+			return false;
+		if( !$wgTitle->userCanEditCssJsSubpage() ) 
+			return false;
+		return $wgUser->matchEditToken(
+			$wgRequest->getVal( 'wpEditToken' ) );
+	}
+	
 	# get the user/site-specific stylesheet, SkinPHPTal called from RawPage.php (settings are cached that way)
 	function getUserStylesheet() {
 		global $wgOut, $wgStylePath, $wgContLang, $wgUser, $wgRequest, $wgTitle, $wgAllowUserCss;
@@ -229,12 +215,14 @@ class Skin {
 		$action = $wgRequest->getText('action');
 		$s = "@import \"$wgStylePath/$sheet\";\n";
 		if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css\";\n";
-		if( $wgAllowUserCss && $wgUser->getID() != 0 ) { # logged in
-			if($wgTitle->isCssSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {
+		if( $wgAllowUserCss && $wgUser->isLoggedIn() ) { # logged in
+			if($wgTitle->isCssSubpage() && $this->userCanPreview( $action ) ) {
 				$s .= $wgRequest->getText('wpTextbox1');
 			} else {
-				$userpage = $wgContLang->getNsText( Namespace::getUser() ) . ":" . $wgUser->getName();
-				$s.= '@import "'.$this->makeUrl($userpage.'/'.$this->getSkinName().'.css', 'action=raw&ctype=text/css').'";'."\n";
+				$userpage = $wgUser->getUserPage();
+				$s.= '@import "'.$this->makeUrl(
+					$userpage->getPrefixedText().'/'.$this->getSkinName().'.css',
+					'action=raw&ctype=text/css').'";'."\n";
 			}
 		}
 		$s .= $this->doGetUserStyles();
@@ -268,19 +256,41 @@ class Skin {
 		$csspage = $wgContLang->getNsText( NS_MEDIAWIKI ) . ':' . $this->getSkinName() . '.css';
 		$s = '@import "'.$this->makeUrl($csspage, 'action=raw&ctype=text/css')."\";\n";
 
-		if ( 1 == $wgUser->getOption( 'underline' ) ) {
-			# Don't override browser settings
-		} else {
-			# CHECK MERGE @@@
-			# Force no underline
-			$s .= "a { text-decoration: none; }\n";
-		}
-		if ( 1 == $wgUser->getOption( 'highlightbroken' ) ) {
+		return $s . $this->reallyDoGetUserStyles();
+	}
+	
+	function reallyDoGetUserStyles() {
+		global $wgUser;
+		$s = '';
+		$underline = $wgUser->getOption( "underline" ) ? 'underline' : 'none';
+		$s .= "a { text-decoration: $underline; }\n";
+		if( $wgUser->getOption( 'highlightbroken' ) ) {
 			$s .= "a.new, #quickbar a.new { color: #CC2200; }\n";
+		} else {
+			$s .= <<<END
+a.new, #quickbar a.new,
+a.stub, #quickbar a.stub {
+	color: inherit;
+	text-decoration: inherit;
+}
+a.new:after, #quickbar a.new:after {
+	content: "?";
+	color: #CC2200;
+	text-decoration: $underline;
+}
+a.stub:after, #quickbar a.stub:after {
+	content: "!";
+	color: #772233;
+	text-decoration: $underline;
+}
+END;
 		}
-		if ( 1 == $wgUser->getOption( 'justify' ) ) {
+		if( $wgUser->getOption( 'justify' ) ) {
 			$s .= "#article { text-align: justify; }\n";
 		}
+		if( !$wgUser->getOption( 'showtoc' ) ) {
+			$s .= "#toc { display: none; }\n";
+		}
 		return $s;
 	}
 
@@ -294,7 +304,7 @@ 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) && $redirect == 'no' ) {
@@ -309,65 +319,13 @@ class Skin {
 
 		}
 		$a['onload'] = $wgOut->getOnloadHandler();
-		return $a;
-	}
-
-	function getExternalLinkAttributes( $link, $text, $class='' ) {
-		global $wgUser, $wgOut, $wgContLang;
-
-		$same = ($link == $text);
-		$link = urldecode( $link );
-		$link = $wgContLang->checkTitleEncoding( $link );
-		$link = str_replace( '_', ' ', $link );
-		$link = htmlspecialchars( $link );
-
-		$r = ($class != '') ? " class='$class'" : " class='external'";
-
-		if ( !$same && $wgUser->getOption( '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' ) {
-			$r = ' class="stub"';
-		} else if ( $broken == 'yes' ) {
-			$r = ' class="new"';
-		} else {
-			$r = '';
-		}
-
-		if ( 1 == $wgUser->getOption( 'hover' ) ) {
-			$r .= " title=\"{$link}\"";
-		}
-		return $r;
-	}
-
-	/**
-	 * @param bool $broken
-	 */
-	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 ( 1 == $wgUser->getOption( 'hover' ) ) {
-			$r .= ' title="' . $nt->getEscapedText() . '"';
+		if( $wgUser->getOption( 'editsectiononrightclick' ) ) {
+			if( $a['onload'] != '' ) {
+				$a['onload'] .= ';';
+			}
+			$a['onload'] .= 'setupRightClickEdit()';
 		}
-		return $r;
+		return $a;
 	}
 
 	/**
@@ -383,13 +341,11 @@ class Skin {
 	 * two functions to make it easier to subclass.
 	 */
 	function beforeContent() {
-		global $wgUser, $wgOut;
-
 		return $this->doBeforeContent();
 	}
 
 	function doBeforeContent() {
-		global $wgUser, $wgOut, $wgTitle, $wgContLang, $wgSiteNotice;
+		global $wgOut, $wgTitle, $wgContLang;
 		$fname = 'Skin::doBeforeContent';
 		wfProfileIn( $fname );
 
@@ -439,8 +395,9 @@ 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";
+		$notice = wfGetSiteNotice();
+		if( $notice ) {
+			$s .= "\n<div id='siteNotice'>$notice</div>\n";
 		}
 		$s .= $this->pageTitle();
 		$s .= $this->pageSubtitle() ;
@@ -451,7 +408,7 @@ class Skin {
 
 	
 	function getCategoryLinks () {
-		global $wgOut, $wgTitle, $wgUser, $wgParser;
+		global $wgOut, $wgTitle, $wgParser;
 		global $wgUseCategoryMagic, $wgUseCategoryBrowser, $wgLang;
 
 		if( !$wgUseCategoryMagic ) return '' ;
@@ -461,22 +418,21 @@ class Skin {
 		#if( !$wgOut->isArticle() ) return '';
 
 		$t = implode ( ' | ' , $wgOut->mCategoryLinks ) ;
-		$s = $this->makeKnownLink( 'Special:Categories',
+		$s = $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Categories' ),
 			wfMsg( 'categories' ), 'article=' . urlencode( $wgTitle->getPrefixedDBkey() ) )
 			. ': ' . $t;
 
 		# optional 'dmoz-like' category browser. Will be shown under the list
 		# of categories an article belong to
 		if($wgUseCategoryBrowser) {
-			$s .= '<br/><hr/>';
+			$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) {
-				global $wgUser;
-				$sk = $wgUser->getSkin();
+			# Need to give skin cause $this is undefined at this level
+			function walkThrough ($tree, &$skin) {
 				$return = '';
 				foreach($tree as $element => $parent) {
 					if(empty($parent)) {
@@ -484,17 +440,19 @@ class Skin {
 						$return .= '<br />';
 					} else {
 						# grab the others elements
-						$return .= walkThrough($parent);
+						$return .= walkThrough($parent, $skin);
 					}
 					# add our current element to the list
 					$eltitle = Title::NewFromText($element);
-					# FIXME : should be makeLink() [AV]
-					$return .= $sk->makeKnownLink($element, $eltitle->getText()).' &gt; ';
+					if(!empty($parent)) $return .= ' &gt; ';
+					$return .=  $skin->makeLinkObj( $eltitle, $eltitle->getText() ) ;
 				}
 				return $return;
 			}
 
-			$s .= walkThrough($parenttree);
+			# Skin object passed by reference cause it can not be
+			# accessed under the method subfunction walkThrough.
+			$s .= walkThrough($parenttree, $this);
 		}
 
 		return $s;
@@ -511,20 +469,20 @@ class Skin {
 		return "<td width='152' rowspan='{$rows}'>&nbsp;</td>";
 	}
 
-	# This gets called immediately before the </body> tag.
-	#
+	/**
+	 * This gets called immediately before the </body> tag.
+	 * @return string HTML to be put after </body> ???
+	 */
 	function afterContent() {
-		global $wgUser, $wgOut, $wgServer;
-		global $wgTitle, $wgLang;
-
 		$printfooter = "<div class=\"printfooter\">\n" . $this->printFooter() . "</div>\n";
 		return $printfooter . $this->doAfterContent();
 	}
 
+	/** @return string Retrievied from HTML text */
 	function printSource() {
 		global $wgTitle;
 		$url = htmlspecialchars( $wgTitle->getFullURL() );
-		return wfMsg( "retrievedfrom", "<a href=\"$url\">$url</a>" );
+		return wfMsg( 'retrievedfrom', '<a href="'.$url.'">'.$url.'</a>' );
 	}
 
 	function printFooter() {
@@ -532,9 +490,8 @@ class Skin {
 			"</p>\n\n<p>" . $this->pageStats() . "</p>\n";
 	}
 
-	function doAfterContent() {
-	# overloaded by derived classes
-	}
+	/** overloaded by derived classes */
+	function doAfterContent() { }
 
 	function pageTitleLinks() {
 		global $wgOut, $wgTitle, $wgUser, $wgContLang, $wgUseApproval, $wgRequest;
@@ -549,11 +506,14 @@ class Skin {
 		}
 
 		if ( $wgOut->isArticleRelated() ) {
-			if ( $wgTitle->getNamespace() == Namespace::getImage() ) {
+			if ( $wgTitle->getNamespace() == NS_IMAGE ) {
 				$name = $wgTitle->getDBkey();
-				$link = htmlspecialchars( Image::wfImageUrl( $name ) );
-				$style = $this->getInternalLinkAttributes( $link, $name );
-				$s .= " | <a href=\"{$link}\"{$style}>{$name}</a>";
+				$image = new Image( $wgTitle );
+				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 )
@@ -567,7 +527,7 @@ class Skin {
 			}
 		}
 		if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
-			$s .= ' | ' . $this->makeKnownLink( $wgTitle->getPrefixedText(),
+			$s .= ' | ' . $this->makeKnownLinkObj( $wgTitle,
 					wfMsg( 'currentrev' ) );
 		}
 
@@ -575,11 +535,8 @@ class Skin {
 		# 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()))) {
-				$n =$wgUser->getName();
-				$tl = $this->makeKnownLink( $wgContLang->getNsText(
-							Namespace::getTalk( Namespace::getUser() ) ) . ":{$n}",
+			if( $wgTitle->equals( $wgUser->getTalkPage() ) ) {
+				$tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
 						wfMsg('newmessageslink') );
 				$s.= ' | <strong>'. wfMsg( 'newmessages', $tl ) . '</strong>';
 				# disable caching
@@ -597,7 +554,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',
@@ -634,7 +591,6 @@ class Skin {
 		global $wgOut, $wgTitle, $wgUser;
 
 		$s = '<h1 class="pagetitle">' . htmlspecialchars( $wgOut->getPageTitle() ) . '</h1>';
-		if($wgUser->getOption( 'editsectiononrightclick' ) && $wgTitle->userCanEdit()) { $s=$this->editSectionScript($wgTitle, 0,$s);}
 		return $s;
 	}
 
@@ -688,13 +644,12 @@ class Skin {
 		$lo = $wgContLang->specialPage( 'Userlogout' );
 
 		$s = '';
-		if ( 0 == $wgUser->getID() ) {
-			if( $wgShowIPinHeader && isset(  $_COOKIE[ini_get('session.name')] ) ) {
+		if ( $wgUser->isAnon() ) {
+			if( $wgShowIPinHeader && isset( $_COOKIE[ini_get('session.name')] ) ) {
 				$n = $wgIP;
 
-				$tl = $this->makeKnownLink( $wgContLang->getNsText(
-				  Namespace::getTalk( Namespace::getUser() ) ) . ":{$n}",
-				  $wgContLang->getNsText( Namespace::getTalk( 0 ) ) );
+				$tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
+				  $wgContLang->getNsText( NS_TALK ) );
 
 				$s .= $n . ' ('.$tl.')';
 			} else {
@@ -706,20 +661,20 @@ class Skin {
 				$q = '';
 			} else { $q = "returnto={$rt}"; }
 
-			$s .= "\n<br />" . $this->makeKnownLink( $li,
-			  wfMsg( 'login' ), $q );
+			$s .= "\n<br />" . $this->makeKnownLinkObj(
+				Title::makeTitle( NS_SPECIAL, 'Userlogin' ),
+				wfMsg( 'login' ), $q );
 		} else {
 			$n = $wgUser->getName();
 			$rt = $wgTitle->getPrefixedURL();
-			$tl = $this->makeKnownLink( $wgContLang->getNsText(
-			  Namespace::getTalk( Namespace::getUser() ) ) . ":{$n}",
-			  $wgContLang->getNsText( Namespace::getTalk( 0 ) ) );
+			$tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
+			  $wgContLang->getNsText( NS_TALK ) );
 
 			$tl = " ({$tl})";
 
-			$s .= $this->makeKnownLink( $wgContLang->getNsText(
-			  Namespace::getUser() ) . ":{$n}", $n ) . "{$tl}<br />" .
-			  $this->makeKnownLink( $lo, wfMsg( 'logout' ),
+			$s .= $this->makeKnownLinkObj( $wgUser->getUserPage(),
+			  $n ) . "{$tl}<br />" .
+			  $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Userlogout' ), wfMsg( 'logout' ),
 			  "returnto={$rt}" ) . ' | ' .
 			  $this->specialLink( 'preferences' );
 		}
@@ -766,6 +721,18 @@ class Skin {
 		# Many people don't like this dropdown box
 		#$s .= $sep . $this->specialPagesList();
 
+		/* show links to different language variants */
+		global $wgDisableLangConversion, $wgContLang, $wgTitle;
+		$variants = $wgContLang->getVariants();
+		if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
+			foreach( $variants as $code ) {
+				$varname = $wgContLang->getVariantname( $code );
+				if( $varname == 'disable' )
+					continue;
+				$s .= ' | <a href="' . $wgTitle->getLocalUrl( 'variant=' . $code ) . '">' . $varname . '</a>';
+			}
+		}
+
 		return $s;
 	}
 
@@ -776,7 +743,7 @@ class Skin {
 		$s = '';
 		if ( $wgOut->isArticleRelated() ) {
 			$s .= '<strong>' . $this->editThisPage() . '</strong>';
-			if ( 0 != $wgUser->getID() ) {
+			if ( $wgUser->isLoggedIn() ) {
 				$s .= $sep . $this->watchThisPage();
 			}
 			$s .= $sep . $this->talkLink()
@@ -784,8 +751,8 @@ class Skin {
 			  . $sep . $this->whatLinksHere()
 			  . $sep . $this->watchPageLinksLink();
 
-			if ( $wgTitle->getNamespace() == Namespace::getUser()
-			    || $wgTitle->getNamespace() == Namespace::getTalk(Namespace::getUser()) )
+			if ( $wgTitle->getNamespace() == NS_USER
+			    || $wgTitle->getNamespace() == NS_USER_TALK )
 
 			{
 				$id=User::idFromName($wgTitle->getText());
@@ -794,16 +761,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();
 		}
@@ -811,8 +777,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 ''; }
@@ -828,12 +794,23 @@ class Skin {
 		}
 
 	        if (isset($wgMaxCredits) && $wgMaxCredits != 0) {
-		    require_once("Credits.php");
+		    require_once('Credits.php');
 		    $s .= ' ' . getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax);
 		} else {
 		    $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();
 	}
 
@@ -864,17 +841,19 @@ class Skin {
 	}
 
 	function getCopyrightIcon() {
-		global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRightsIcon;
+		global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRightsIcon, $wgCopyrightIcon;
 		$out = '';
-		if( $wgRightsIcon ) {
+		if ( isset( $wgCopyrightIcon ) && $wgCopyrightIcon ) {
+			$out = $wgCopyrightIcon;
+		} else if ( $wgRightsIcon ) {
 			$icon = htmlspecialchars( $wgRightsIcon );
-			if( $wgRightsUrl ) {
+			if ( $wgRightsUrl ) {
 				$url = htmlspecialchars( $wgRightsUrl );
 				$out .= '<a href="'.$url.'">';
 			}
 			$text = htmlspecialchars( $wgRightsText );
 			$out .= "<img src=\"$icon\" alt='$text' />";
-			if( $wgRightsUrl ) {
+			if ( $wgRightsUrl ) {
 				$out .= '</a>';
 			}
 		}
@@ -889,15 +868,18 @@ class Skin {
 	}
 
 	function lastModified() {
-		global $wgLang, $wgArticle;
+		global $wgLang, $wgArticle, $wgLoadBalancer;
 
 		$timestamp = $wgArticle->getTimestamp();
 		if ( $timestamp ) {
-			$d = $wgLang->timeanddate( $wgArticle->getTimestamp(), true );
+			$d = $wgLang->timeanddate( $timestamp, true );
 			$s = ' ' . wfMsg( 'lastmodified', $d );
 		} else {
 			$s = '';
 		}
+		if ( $wgLoadBalancer->getLaggedSlaveMode() ) {
+			$s .= ' <strong>' . wfMsg( 'laggedslavemode' ) . '</strong>';
+		}
 		return $s;
 	}
 
@@ -918,27 +900,34 @@ class Skin {
 		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;
+		global $wgUser, $wgOut, $wgContLang, $wgServer, $wgRedirectScript, $wgAvailableRights;
 		require_once('SpecialPage.php');
 		$a = array();
 		$pages = SpecialPage::getPages();
 
+		// special pages without access restriction
 		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() ;
+
+		// Other special pages that are restricted.
+		// Copied from SpecialSpecialpages.php
+		foreach($wgAvailableRights as $right) {
+			if( $wgUser->isAllowed($right) ) {
+				/** Add all pages for this right */
+				if(isset($pages[$right])) {
+					foreach($pages[$right] as $name => $page) {
+					$a[$name] = $page->getDescription();
+					}
+				}
 			}
 		}
+		
 		$go = wfMsg( 'go' );
 		$sp = wfMsg( 'specialpages' );
 		$spp = $wgContLang->specialPage( 'Specialpages' );
@@ -948,6 +937,7 @@ class Skin {
 		$s .= "<select name=\"wpDropdown\">\n";
 		$s .= "<option value=\"{$spp}\">{$sp}</option>\n";
 
+		
 		foreach ( $a as $name => $desc ) {
 			$p = $wgContLang->specialPage( $name );
 			$s .= "<option value=\"{$p}\">{$desc}</option>\n";
@@ -981,7 +971,7 @@ class Skin {
 	function disclaimerLink() {
 		$disclaimers = wfMsg( 'disclaimers' );
 		if ($disclaimers == '-') {
-			return "";
+			return '';
 		} else {
 			return $this->makeKnownLink( wfMsgForContent( 'disclaimerpage' ),
 			                             $disclaimers );
@@ -998,11 +988,9 @@ class Skin {
 		if ( ! $wgOut->isArticleRelated() ) {
 			$s = wfMsg( 'protectedpage' );
 		} else {
-			$n = $wgTitle->getPrefixedText();
 			if ( $wgTitle->userCanEdit() ) {
 				$t = wfMsg( 'editthispage' );
 			} else {
-				#$t = wfMsg( "protectedpage" );
 				$t = wfMsg( 'viewsource' );
 			}
 			$oid = $red = '';
@@ -1011,7 +999,7 @@ class Skin {
 			if ( $oldid && ! isset( $diff ) ) {
 				$oid = '&oldid='.$oldid;
 			}
-			$s = $this->makeKnownLink( $n, $t, "action=edit{$oid}{$red}" );
+			$s = $this->makeKnownLinkObj( $wgTitle, $t, "action=edit{$oid}{$red}" );
 		}
 		return $s;
 	}
@@ -1020,11 +1008,10 @@ class Skin {
 		global $wgUser, $wgOut, $wgTitle, $wgRequest;
 
 		$diff = $wgRequest->getVal( 'diff' );
-		if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isSysop() ) {
-			$n = $wgTitle->getPrefixedText();
+		if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('delete') ) {
 			$t = wfMsg( 'deletethispage' );
 
-			$s = $this->makeKnownLink( $n, $t, 'action=delete' );
+			$s = $this->makeKnownLinkObj( $wgTitle, $t, 'action=delete' );
 		} else {
 			$s = '';
 		}
@@ -1035,9 +1022,7 @@ class Skin {
 		global $wgUser, $wgOut, $wgTitle, $wgRequest;
 
 		$diff = $wgRequest->getVal( 'diff' );
-		if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isSysop() ) {
-			$n = $wgTitle->getPrefixedText();
-
+		if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
 			if ( $wgTitle->isProtected() ) {
 				$t = wfMsg( 'unprotectthispage' );
 				$q = 'action=unprotect';
@@ -1045,7 +1030,7 @@ class Skin {
 				$t = wfMsg( 'protectthispage' );
 				$q = 'action=protect';
 			}
-			$s = $this->makeKnownLink( $n, $t, $q );
+			$s = $this->makeKnownLinkObj( $wgTitle, $t, $q );
 		} else {
 			$s = '';
 		}
@@ -1056,8 +1041,6 @@ class Skin {
 		global $wgUser, $wgOut, $wgTitle;
 
 		if ( $wgOut->isArticleRelated() ) {
-			$n = $wgTitle->getPrefixedText();
-
 			if ( $wgTitle->userIsWatching() ) {
 				$t = wfMsg( 'unwatchthispage' );
 				$q = 'action=unwatch';
@@ -1065,7 +1048,7 @@ class Skin {
 				$t = wfMsg( 'watchthispage' );
 				$q = 'action=watch';
 			}
-			$s = $this->makeKnownLink( $n, $t, $q );
+			$s = $this->makeKnownLinkObj( $wgTitle, $t, $q );
 		} else {
 			$s = wfMsg( 'notanarticle' );
 		}
@@ -1073,83 +1056,79 @@ class Skin {
 	}
 
 	function moveThisPage() {
-		global $wgTitle, $wgContLang;
+		global $wgTitle;
 
-		if ( $wgTitle->userCanEdit() ) {
-			$s = $this->makeKnownLink( $wgContLang->specialPage( 'Movepage' ),
+		if ( $wgTitle->userCanMove() ) {
+			return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Movepage' ),
 			  wfMsg( 'movethispage' ), 'target=' . $wgTitle->getPrefixedURL() );
-		} // no message if page is protected - would be redundant
-		return $s;
+		} else {
+			// no message if page is protected - would be redundant
+			return '';
+		}
 	}
 
 	function historyLink() {
 		global $wgTitle;
 
-		$s = $this->makeKnownLink( $wgTitle->getPrefixedText(),
+		return $this->makeKnownLinkObj( $wgTitle,
 		  wfMsg( 'history' ), 'action=history' );
-		return $s;
 	}
 
 	function whatLinksHere() {
-		global $wgTitle, $wgContLang;
+		global $wgTitle;
 
-		$s = $this->makeKnownLink( $wgContLang->specialPage( 'Whatlinkshere' ),
+		return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Whatlinkshere' ),
 		  wfMsg( 'whatlinkshere' ), 'target=' . $wgTitle->getPrefixedURL() );
-		return $s;
 	}
 
 	function userContribsLink() {
-		global $wgTitle, $wgContLang;
+		global $wgTitle;
 
-		$s = $this->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
+		return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions' ),
 		  wfMsg( 'contributions' ), 'target=' . $wgTitle->getPartialURL() );
-		return $s;
 	}
 
+	function showEmailUser( $id ) {
+		global $wgEnableEmail, $wgEnableUserEmail, $wgUser;
+		return $wgEnableEmail &&
+		       $wgEnableUserEmail &&
+		       $wgUser->isLoggedIn() && # 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;
+		global $wgTitle;
 
-		$s = $this->makeKnownLink( $wgContLang->specialPage( 'Emailuser' ),
+		return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Emailuser' ),
 		  wfMsg( 'emailuser' ), 'target=' . $wgTitle->getPartialURL() );
-		return $s;
 	}
 
 	function watchPageLinksLink() {
-		global $wgOut, $wgTitle, $wgContLang;
+		global $wgOut, $wgTitle;
 
 		if ( ! $wgOut->isArticleRelated() ) {
-			$s = '(' . wfMsg( 'notanarticle' ) . ')';
+			return '(' . wfMsg( 'notanarticle' ) . ')';
 		} else {
-			$s = $this->makeKnownLink( $wgContLang->specialPage(
+			return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL,
 			  'Recentchangeslinked' ), wfMsg( 'recentchangeslinked' ),
 			  'target=' . $wgTitle->getPrefixedURL() );
 		}
-		return $s;
 	}
 
 	function otherLanguages() {
-		global $wgOut, $wgContLang, $wgTitle, $wgUseNewInterlanguage;
+		global $wgOut, $wgContLang, $wgTitle, $wgHideInterlanguageLinks;
+
+		if ( $wgHideInterlanguageLinks ) {
+			return '';
+		}
 
 		$a = $wgOut->getLanguageLinks();
 		if ( 0 == count( $a ) ) {
-			if ( !$wgUseNewInterlanguage ) return '';
-			$ns = $wgContLang->getNsIndex ( $wgTitle->getNamespace () ) ;
-			if ( $ns != 0 AND $ns != 1 ) return '' ;
-			$pn = 'Intl' ;
-			$x = 'mode=addlink&xt='.$wgTitle->getDBkey() ;
-			return $this->makeKnownLink( $wgContLang->specialPage( $pn ),
-				  wfMsg( 'intl' ) , $x );
-			}
-
-		if ( !$wgUseNewInterlanguage ) {
-			$s = wfMsg( 'otherlanguages' ) . ': ';
-		} else {
-			global $wgContLanguageCode ;
-			$x = 'mode=zoom&xt='.$wgTitle->getDBkey() ;
-			$x .= '&xl='.$wgContLanguageCode ;
-			$s =  $this->makeKnownLink( $wgContLang->specialPage( 'Intl' ),
-				  wfMsg( 'otherlanguages' ) , $x ) . ': ' ;
-			}
+			return '';
+		}
 
 		$s = wfMsg( 'otherlanguages' ) . ': ';
 		$first = true;
@@ -1159,7 +1138,7 @@ class Skin {
 			$first = false;
 
 			$nt = Title::newFromText( $l );
-			$url = $nt->getFullURL();
+			$url = $nt->escapeFullURL();
 			$text = $wgContLang->getLanguageName( $nt->getInterwiki() );
 
 			if ( '' == $text ) { $text = $l; }
@@ -1205,42 +1184,38 @@ class Skin {
 	}
 
 	function talkLink() {
-		global $wgContLang, $wgTitle, $wgLinkCache;
+		global $wgTitle, $wgLinkCache;
 
-		$tns = $wgTitle->getNamespace();
-		if ( -1 == $tns ) { return ''; }
+		if ( NS_SPECIAL == $wgTitle->getNamespace() ) {
+			# No discussion links for special pages
+			return '';
+		}
 
-		$pn = $wgTitle->getText();
-		$tp = wfMsg( 'talkpage' );
-		if ( Namespace::isTalk( $tns ) ) {
-			$lns = Namespace::getSubject( $tns );
-			switch($tns) {
-				case 1:
+		if( $wgTitle->isTalkPage() ) {
+			$link = $wgTitle->getSubjectPage();
+			switch( $link->getNamespace() ) {
+			case NS_MAIN:
 				$text = wfMsg('articlepage');
 				break;
-				case 3:
+			case NS_USER:
 				$text = wfMsg('userpage');
 				break;
-				case 5:
+			case NS_PROJECT:
 				$text = wfMsg('wikipediapage');
 				break;
-				case 7:
+			case NS_IMAGE:
 				$text = wfMsg('imagepage');
 				break;
-				default:
+			default:
 				$text= wfMsg('articlepage');
 			}
 		} else {
-
-			$lns = Namespace::getTalk( $tns );
-			$text=$tp;
+			$link = $wgTitle->getTalkPage();
+			$text = wfMsg( 'talkpage' );
 		}
-		$n = $wgContLang->getNsText( $lns );
-		if ( '' == $n ) { $link = $pn; }
-		else { $link = $n.':'.$pn; }
 
 		$wgLinkCache->suspend();
-		$s = $this->makeLink( $link, $text );
+		$s = $this->makeLinkObj( $link, $text );
 		$wgLinkCache->resume();
 
 		return $s;
@@ -1249,332 +1224,25 @@ class Skin {
 	function commentLink() {
 		global $wgContLang, $wgTitle, $wgLinkCache;
 
-		$tns = $wgTitle->getNamespace();
-		if ( -1 == $tns ) { return ''; }
-
-		$lns = ( Namespace::isTalk( $tns ) ) ? $tns : Namespace::getTalk( $tns );
-
-		# assert Namespace::isTalk( $lns )
-
-		$n = $wgContLang->getNsText( $lns );
-		$pn = $wgTitle->getText();
-
-		$link = $n.':'.$pn;
-
-		$wgLinkCache->suspend();
-		$s = $this->makeKnownLink($link, wfMsg('postcomment'), 'action=edit&section=new');
-		$wgLinkCache->resume();
-
-		return $s;
-	}
-
-	/**
-	 * After all the page content is transformed into HTML, it makes
-	 * a final pass through here for things like table backgrounds.
-	 * @todo probably deprecated [AV]
-	 */
-	function transformContent( $text ) {
-		return $text;
-	}
-
-	/**
-	 * Note: This function MUST call getArticleID() on the link,
-	 * otherwise the cache won't get updated properly.  See LINKCACHE.DOC.
-	 */
-	function makeLink( $title, $text = '', $query = '', $trail = '' ) {
-		wfProfileIn( 'Skin::makeLink' );
-	 	$nt = Title::newFromText( $title );
-		if ($nt) {
-			$result = $this->makeLinkObj( Title::newFromText( $title ), $text, $query, $trail );
-		} else {
-			wfDebug( 'Invalid title passed to Skin::makeLink(): "'.$title."\"\n" );
-			$result = $text == "" ? $title : $text;
-		}
-
-		wfProfileOut( 'Skin::makeLink' );
-		return $result;
-	}
-
-	function makeKnownLink( $title, $text = '', $query = '', $trail = '', $prefix = '',$aprops = '') {
-		$nt = Title::newFromText( $title );
-		if ($nt) {
-			return $this->makeKnownLinkObj( Title::newFromText( $title ), $text, $query, $trail, $prefix , $aprops );
-		} else {
-			wfDebug( 'Invalid title passed to Skin::makeKnownLink(): "'.$title."\"\n" );
-			return $text == '' ? $title : $text;
-		}
-	}
-
-	function makeBrokenLink( $title, $text = '', $query = '', $trail = '' ) {
-		$nt = Title::newFromText( $title );
-		if ($nt) {
-			return $this->makeBrokenLinkObj( Title::newFromText( $title ), $text, $query, $trail );
-		} else {
-			wfDebug( 'Invalid title passed to Skin::makeBrokenLink(): "'.$title."\"\n" );
-			return $text == '' ? $title : $text;
-		}
-	}
-
-	function makeStubLink( $title, $text = '', $query = '', $trail = '' ) {
-		$nt = Title::newFromText( $title );
-		if ($nt) {
-			return $this->makeStubLinkObj( Title::newFromText( $title ), $text, $query, $trail );
-		} else {
-			wfDebug( 'Invalid title passed to Skin::makeStubLink(): "'.$title."\"\n" );
-			return $text == '' ? $title : $text;
-		}
-	}
-
-	/**
-	 * Pass a title object, not a title string
-	 */
-	function makeLinkObj( &$nt, $text= '', $query = '', $trail = '', $prefix = '' ) {
-		global $wgOut, $wgUser, $wgLinkHolders;
-		$fname = 'Skin::makeLinkObj';
-
-		# Fail gracefully
-		if ( ! isset($nt) ) {
-			# wfDebugDieBacktrace();
-			return "<!-- ERROR -->{$prefix}{$text}{$trail}";
-		}
-
-		if ( $nt->isExternal() ) {
-			$u = $nt->getFullURL();
-			$link = $nt->getPrefixedURL();
-			if ( '' == $text ) { $text = $nt->getPrefixedText(); }
-			$style = $this->getExternalLinkAttributes( $link, $text, 'extiw' );
-
-			$inside = '';
-			if ( '' != $trail ) {
-				if ( preg_match( '/^([a-z]+)(.*)$$/sD', $trail, $m ) ) {
-					$inside = $m[1];
-					$trail = $m[2];
-				}
-			}
-			# Assume $this->postParseLinkColour(). This prevents
-			# interwiki links from being parsed as external links.
-			global $wgInterwikiLinkHolders;
-			$t = "<a href=\"{$u}\"{$style}>{$text}{$inside}</a>";
-			$nr = array_push($wgInterwikiLinkHolders, $t);
-			$retVal = '<!--IWLINK '. ($nr-1) ."-->{$trail}";
-		} elseif ( 0 == $nt->getNamespace() && "" == $nt->getText() ) {
-			$retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
-		} elseif ( ( -1 == $nt->getNamespace() ) ||
-				( NS_IMAGE == $nt->getNamespace() ) ) {
-			$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];
-					}
-				}
-
-				# 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;
-
-				$retVal = '<!--LINK '. ($nr-1) ."-->{$trail}";
-			} 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 {
-							$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 );
-					}
-				}
-			}
-		}
-		return $retVal;
-	}
-
-	/**
-	 * Pass a title object, not a title string
-	 */
-	function makeKnownLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '' ) {
-		global $wgOut, $wgTitle, $wgInputEncoding;
-
-		$fname = 'Skin::makeKnownLinkObj';
-		wfProfileIn( $fname );
-
-		if ( !is_object( $nt ) ) {
-			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 );
-		}
-		if ( '' != $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() );
-		}
-		$style = $this->getInternalLinkAttributesObj( $nt, $text );
-
-		$inside = '';
-		if ( '' != $trail ) {
-			if ( preg_match( $this->linktrail, $trail, $m ) ) {
-				$inside = $m[1];
-				$trail = $m[2];
-			}
-		}
-		$r = "<a href=\"{$u}\"{$style}{$aprops}>{$prefix}{$text}{$inside}</a>{$trail}";
-		wfProfileOut( $fname );
-		return $r;
-	}
-
-	/**
-	 * Pass a title object, not a title string
-	 */
-	function makeBrokenLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
-		global $wgOut, $wgUser;
-
-		# Fail gracefully
-		if ( ! isset($nt) ) {
-			# wfDebugDieBacktrace();
-			return "<!-- ERROR -->{$prefix}{$text}{$trail}";
-		}
-
-		$fname = 'Skin::makeBrokenLinkObj';
-		wfProfileIn( $fname );
-
-		if ( '' == $query ) {
-			$q = 'action=edit';
-		} else {
-			$q = 'action=edit&'.$query;
-		}
-		$u = $nt->escapeLocalURL( $q );
-
-		if ( '' == $text ) {
-			$text = htmlspecialchars( $nt->getPrefixedText() );
-		}
-		$style = $this->getInternalLinkAttributesObj( $nt, $text, "yes" );
-
-		$inside = '';
-		if ( '' != $trail ) {
-			if ( preg_match( $this->linktrail, $trail, $m ) ) {
-				$inside = $m[1];
-				$trail = $m[2];
-			}
-		}
-		if ( $wgUser->getOption( 'highlightbroken' ) ) {
-			$s = "<a href=\"{$u}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
-		} else {
-			$s = "{$prefix}{$text}{$inside}<a href=\"{$u}\"{$style}>?</a>{$trail}";
-		}
-
-		wfProfileOut( $fname );
-		return $s;
-	}
-
-	/**
- 	 * 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 );
-
-		if ( '' == $text ) {
-			$text = htmlspecialchars( $nt->getPrefixedText() );
-		}
-		$style = $this->getInternalLinkAttributesObj( $nt, $text, 'stub' );
-
-		$inside = '';
-		if ( '' != $trail ) {
-			if ( preg_match( $this->linktrail, $trail, $m ) ) {
-				$inside = $m[1];
-				$trail = $m[2];
-			}
-		}
-		if ( $wgUser->getOption( 'highlightbroken' ) ) {
-			$s = "<a href=\"{$u}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
-		} else {
-			$s = "{$prefix}{$text}{$inside}<a href=\"{$u}\"{$style}>!</a>{$trail}";
-		}
-		return $s;
-	}
-
-	function makeSelfLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
-		$u = $nt->escapeLocalURL( $query );
-		if ( '' == $text ) {
-			$text = htmlspecialchars( $nt->getPrefixedText() );
-		}
-		$inside = '';
-		if ( '' != $trail ) {
-			if ( preg_match( $this->linktrail, $trail, $m ) ) {
-				$inside = $m[1];
-				$trail = $m[2];
-			}
+		if ( $wgTitle->getNamespace() == NS_SPECIAL ) {
+			return '';
 		}
-		return "<strong>{$prefix}{$text}{$inside}</strong>{$trail}";
+		return $this->makeKnownLinkObj( $wgTitle->getTalkPage(),
+			wfMsg( 'postcomment' ), 'action=edit&section=new' );
 	}
 
 	/* 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);
-		return $title->getLocalURL( $urlaction );
-	}
-	/*static*/ function makeTalkUrl ( $name, $urlaction='' ) {
-		$title = Title::newFromText( $name );
-		$title = $title->getTalkPage();
-		$this->checkTitle($title, $name);
-		return $title->getLocalURL( $urlaction );
-	}
-	/*static*/ function makeArticleUrl ( $name, $urlaction='' ) {
-		$title = Title::newFromText( $name );
-		$title= $title->getSubjectPage();
-		$this->checkTitle($title, $name);
 		return $title->getLocalURL( $urlaction );
 	}
+	
 	/*static*/ function makeI18nUrl ( $name, $urlaction='' ) {
 		$title = Title::newFromText( wfMsgForContent($name) );
 		$this->checkTitle($title, $name);
 		return $title->getLocalURL( $urlaction );
 	}
+	
 	/*static*/ function makeUrl ( $name, $urlaction='' ) {
 		$title = Title::newFromText( $name );
 		$this->checkTitle($title, $name);
@@ -1592,7 +1260,7 @@ class Skin {
 	}
 
 	# this can be passed the NS number as defined in Language.php
-	/*static*/ function makeNSUrl( $name, $urlaction='', $namespace=0 ) {
+	/*static*/ function makeNSUrl( $name, $urlaction='', $namespace=NS_MAIN ) {
 		$title = Title::makeTitleSafe( $namespace, $name );
 		$this->checkTitle($title, $name);
 		return $title->getLocalURL( $urlaction );
@@ -1607,32 +1275,6 @@ class Skin {
 			'exists' => $title->getArticleID() != 0?true:false
 		);
 	}
-	/*static*/ function makeTalkUrlDetails ( $name, $urlaction='' ) {
-		$title = Title::newFromText( $name );
-		$title = $title->getTalkPage();
-		$this->checkTitle($title, $name);
-		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(
-			'href' => $title->getLocalURL( $urlaction ),
-			'exists' => $title->getArticleID() != 0?true:false
-		);
-	}
-	/*static*/ function makeI18nUrlDetails ( $name, $urlaction='' ) {
-		$title = Title::newFromText( wfMsgForContent($name) );
-		$this->checkTitle($title, $name);
-		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 ) {
@@ -1644,1131 +1286,6 @@ class Skin {
 		}
 	}
 
-	function fnamePart( $url ) {
-		$basename = strrchr( $url, '/' );
-		if ( false === $basename ) {
-			$basename = $url;
-		} else {
-			$basename = substr( $basename, 1 );
-		}
-		return htmlspecialchars( $basename );
-	}
-
-	function makeImage( $url, $alt = '' ) {
-		global $wgOut;
-
-		if ( '' == $alt ) {
-			$alt = $this->fnamePart( $url );
-		}
-		$s = '<img src="'.$url.'" alt="'.$alt.'" />';
-		return $s;
-	}
-
-	function makeImageLink( $name, $url, $alt = '' ) {
-		$nt = Title::makeTitleSafe( NS_IMAGE, $name );
-		return $this->makeImageLinkObj( $nt, $alt );
-	}
-
-	function makeImageLinkObj( $nt, $alt = '' ) {
-		global $wgContLang, $wgUseImageResize;
-		$img   = Image::newFromTitle( $nt );
-		$url   = $img->getViewURL();
-
-		$align = '';
-		$prefix = $postfix = '';
-
-		# 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 ( $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;
-			}
-		}
-		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;
-
-		} elseif ( isset($width) ) {
-
-			# Create a resized image, without the additional thumbnail
-			# features
-
-			if (    ( ! $height === false )
-			     && ( $img->getHeight() * $width / $img->getWidth() > $height ) ) {
-				$width = $img->getWidth() * $height / $img->getHeight();
-			}
-			if ( '' == $manual_thumb ) $url = $img->createThumb( $width );
-		}
-
-		if ( empty( $alt ) ) {
-			$alt = preg_replace( '/\.(.+?)^/', '', $img->getName() );
-		}
-		$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();
-		$uf = $nt->escapeFullURL();
-		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.'" longdesc="'.$uf.'" /></a>';
-		}
-		if ( '' != $align ) {
-			$s = "<div class=\"float{$align}\"><span>{$s}</span></div>";
-		}
-		return str_replace("\n", ' ',$prefix.$s.$postfix);
-	}
-
-	/**
-	 * 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, $wgContLang;
-		# $image = Title::makeTitleSafe( NS_IMAGE, $name );
-		$url  = $img->getViewURL();
-
-		#$label = htmlspecialchars( $label );
-		$alt = preg_replace( '/<[^>]*>/', '', $label);
-		$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() )
-		{
-			$width  = $img->getWidth();
-			$height = $img->getHeight();
-		}
-		if ( 0 == $width || 0 == $height )
-		{
-			$width = $height = 200;
-		}
-		if ( $boxwidth == 0 )
-		{
-			$boxwidth = 200;
-		}
-		if ( $framed )
-		{
-			// Use image dimensions, don't scale
-			$boxwidth  = $width;
-			$oboxwidth = $boxwidth + 2;
-			$boxheight = $height;
-			$thumbUrl  = $url;
-		} else {
-			$h  = intval( $height/($width/$boxwidth) );
-			$oboxwidth = $boxwidth + 2;
-			if ( ( ! $boxheight === false ) &&  ( $h > $boxheight ) )
-			{
-				$boxwidth *= $boxheight/$h;
-			} else {
-				$boxheight = $h;
-			}
-			if ( '' == $manual_thumb ) $thumbUrl = $img->createThumb( $boxwidth );
-		}
-
-		if ( $manual_thumb != '' ) # Use manually specified thumbnail
-		{
-			$manual_title = Title::makeTitleSafe( NS_IMAGE, $manual_thumb ); #new Title ( $manual_thumb ) ;
-			$manual_img = Image::newFromTitle( $manual_title );
-			$thumbUrl = $manual_img->getViewURL();
-			if ( $manual_img->exists() )
-			{
-				$width  = $manual_img->getWidth();
-				$height = $manual_img->getHeight();
-				$boxwidth = $width ;
-				$boxheight = $height ;
-				$oboxwidth = $boxwidth + 2 ;
-			}
-		}
-
-		$u = $img->getEscapeLocalURL();
-		$uf = $img->getEscapeFullURL();
-
-		$more = htmlspecialchars( wfMsg( 'thumbnail-more' ) );
-		$magnifyalign = $wgContLang->isRTL() ? 'left' : 'right';
-		$textalign = $wgContLang->isRTL() ? ' style="text-align:right"' : '';
-
-		$s = "<div class=\"thumb t{$align}\"><div style=\"width:{$oboxwidth}px;\">";
-		if ( $thumbUrl == '' ) {
-			$s .= wfMsg( 'missingimage', $img->getName() );
-			$zoomicon = '';
-		} else {
-			$s .= '<a href="'.$u.'" class="internal" title="'.$alt.'">'.
-				'<img src="'.$thumbUrl.'" alt="'.$alt.'" ' .
-				'width="'.$boxwidth.'" height="'.$boxheight.'" ' .
-				'longdesc="'.$uf.'" /></a>';
-			if ( $framed ) {
-				$zoomicon="";
-			} else {
-				$zoomicon =  '<div class="magnify" style="float:'.$magnifyalign.'">'.
-					'<a href="'.$u.'" class="internal" title="'.$more.'">'.
-					'<img src="'.$wgStylePath.'/common/images/magnify-clip.png" ' .
-					'width="15" height="11" alt="'.$more.'" /></a></div>';
-			}
-		}
-		$s .= '  <div class="thumbcaption" '.$textalign.'>'.$zoomicon.$label."</div></div></div>";
-		return str_replace("\n", ' ', $s);
-	}
-
-	function makeMediaLink( $name, $url, $alt = '' ) {
-		$nt = Title::makeTitleSafe( Namespace::getMedia(), $name );
-		return $this->makeMediaLinkObj( $nt, $alt );
-	}
-
-	function makeMediaLinkObj( $nt, $alt = '' ) {
-		if ( ! isset( $nt ) )
-		{
-			### HOTFIX. Instead of breaking, return empty string.
-			$s = $alt;
-		} else {
-			$name = $nt->getDBKey();
-			$url = Image::wfImageUrl( $name );
-			if ( empty( $alt ) ) {
-				$alt = preg_replace( '/\.(.+?)^/', '', $name );
-			}
-
-			$u = htmlspecialchars( $url );
-			$s = "<a href=\"{$u}\" class='internal' title=\"{$alt}\">{$alt}</a>";
-		}
-		return $s;
-	}
-
-	function specialLink( $name, $key = '' ) {
-		global $wgContLang;
-
-		if ( '' == $key ) { $key = strtolower( $name ); }
-		$pn = $wgContLang->ucfirst( $name );
-		return $this->makeKnownLink( $wgContLang->specialPage( $pn ),
-		  wfMsg( $key ) );
-	}
-
-	function makeExternalLink( $url, $text, $escape = true ) {
-		$style = $this->getExternalLinkAttributes( $url, $text );
-		$url = htmlspecialchars( $url );
-		if( $escape ) {
-			$text = htmlspecialchars( $text );
-		}
-		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
-	 * comments. It escapes any HTML in the comment, but adds some CSS to format
-	 * auto-generated comments (from section editing) and formats [[wikilinks]].
-	 *
-	 * The &$title parameter must be a title OBJECT. It is used to generate a
-	 * direct link to the section in the autocomment.
-	 * @author Erik Moeller <moeller@scireview.de>
-	 *
-	 * Note: there's not always a title to pass to this function.
-	 * Since you can't set a default parameter for a reference, I've turned it
-	 * temporarily to a value pass. Should be adjusted further. --brion
-	 */
-	function formatComment($comment, $title = NULL) {
-		global $wgContLang;
-		$comment = htmlspecialchars( $comment );
-
-		# The pattern for autogen comments is / * foo * /, which makes for
-		# some nasty regex.
-		# We look for all comments, match any text before and after the comment,
-		# add a separator where needed and format the comment itself with CSS
-		while (preg_match('/(.*)\/\*\s*(.*?)\s*\*\/(.*)/', $comment,$match)) {
-			$pre=$match[1];
-			$auto=$match[2];
-			$post=$match[3];
-			$link='';
-			if($title) {
-				$section=$auto;
-
-				# This is hackish but should work in most cases.
-				$section=str_replace('[[','',$section);
-				$section=str_replace(']]','',$section);
-				$title->mFragment=$section;
-				$link=$this->makeKnownLinkObj($title,wfMsg('sectionlink'));
-			}
-			$sep='-';
-			$auto=$link.$auto;
-			if($pre) { $auto = $sep.' '.$auto; }
-			if($post) { $auto .= ' '.$sep; }
-			$auto='<span class="autocomment">'.$auto.'</span>';
-			$comment=$pre.$auto.$post;
-		}
-
-		# format regular and media links - all other wiki formatting
-		# is ignored
-		$medians = $wgContLang->getNsText(Namespace::getMedia()).':';
-		while(preg_match('/\[\[(.*?)(\|(.*?))*\]\](.*)$/',$comment,$match)) {
-			# Handle link renaming [[foo|text]] will show link as "text"
-			if( "" != $match[3] ) {
-				$text = $match[3];
-			} else {
-				$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( wfMsgForContent( "linktrail" ), $match[4], $submatch ) ) {
-					$trail = $submatch[1];
-				} else {
-					$trail = "";
-				}
-				$linkRegexp = '/\[\[(.*?)\]\]' . preg_quote( $trail, '/' ) . '/';
-				if ($match[1][0] == ':')
-					$match[1] = substr($match[1], 1);
-				$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 ) {
-		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 );
-	}
-
-	function tocUnindent($level) {
-		return str_repeat( "</div>\n", $level>0 ? $level : 0 );
-	}
-
-	/**
-	 * parameter level defines if we are on an indentation level
-	 */
-	function tocLine( $anchor, $tocline, $level ) {
-		$link = '<a href="#'.$anchor.'">'.$tocline.'</a><br />';
-		if($level) {
-			return $link."\n";
-		} else {
-			return '<div class="tocline">'.$link."</div>\n";
-		}
-
-	}
-
-	function tocTable($toc) {
-		# note to CSS fanatics: putting this in a div does not work -- div won't auto-expand
-		# try min-width & co when somebody gets a chance
-		$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>'.wfMsgForContent('toc').'</b>' .
-		$hideline .
-		'</td></tr><tr id="tocinside"><td>'."\n".
-		$toc."</td></tr></table>\n";
-	}
-
-	/**
-	 * These two do not check for permissions: check $wgTitle->userCanEdit
-	 * before calling them
-	 */
-	function editSectionScriptForOther( $title, $section, $head ) {
-		$ttl = Title::newFromText( $title );
-		$url = $ttl->escapeLocalURL( 'action=edit&section='.$section );
-		return '<span oncontextmenu=\'document.location="'.$url.'";return false;\'>'.$head.'</span>';
-	}
-
-	function editSectionScript( $nt, $section, $head ) {
-		global $wgRequest;
-		if( $wgRequest->getInt( 'oldid' ) && ( $wgRequest->getVal( 'diff' ) != '0' ) ) {
-			return $head;
-		}
-		$url = $nt->escapeLocalURL( 'action=edit&section='.$section );
-		return '<span oncontextmenu=\'document.location="'.$url.'";return false;\'>'.$head.'</span>';
-	}
-
-	function editSectionLinkForOther( $title, $section ) {
-		global $wgRequest;
-		global $wgContLang;
-
-		$title = Title::newFromText($title);
-		$editurl = '&section='.$section;
-		$url = $this->makeKnownLink($title->getPrefixedText(),wfMsg('editsection'),'action=edit'.$editurl);
-
-		if( $wgContLang->isRTL() ) {
-			$farside = 'left';
-			$nearside = 'right';
-		} else {
-			$farside = 'right';
-			$nearside = 'left';
-		}
-		return "<div class=\"editsection\" style=\"float:$farside;margin-$nearside:5px;\">[".$url."]</div>";
-
-	}
-
-	function editSectionLink( $nt, $section ) {
-		global $wgRequest;
-		global $wgContLang;
-
-		if( $wgRequest->getInt( 'oldid' ) && ( $wgRequest->getVal( 'diff' ) != '0' ) ) {
-			# Section edit links would be out of sync on an old page.
-			# But, if we're diffing to the current page, they'll be
-			# correct.
-			return '';
-		}
-
-		$editurl = '&section='.$section;
-		$url = $this->makeKnownLink($nt->getPrefixedText(),wfMsg('editsection'),'action=edit'.$editurl);
-
-		if( $wgContLang->isRTL() ) {
-			$farside = 'left';
-			$nearside = 'right';
-		} else {
-			$farside = 'right';
-			$nearside = 'left';
-		}
-		return "<div class=\"editsection\" style=\"float:$farside;margin-$nearside:5px;\">[".$url."]</div>";
-
-	}
-
-	/**
-	 * 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
-	 */
-	function suppressUrlExpansion() {
-		return false;
-	}
 }
 
 }