X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSkin.php;h=2c989b0572e0109477b9243cc1db52bac76987ef;hb=63d232acf4ddb2b2b5da215ac95a50584cbd4b77;hp=406e83cb3c6bba9753b3749a52024ec5c9e67786;hpb=f571b7e068300906fc91f571214fe9938e179f9a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Skin.php b/includes/Skin.php
index 406e83cb3c..2c989b0572 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -12,6 +12,7 @@
 if( defined( "MEDIAWIKI" ) ) {
 
 # See skin.doc
+require_once( 'Linker.php' );
 require_once( 'Image.php' );
 
 # Get a list of all skins available in /skins/
@@ -23,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();
@@ -70,20 +71,18 @@ 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');
+		parent::Linker();
 	}
 
 	function getSkinNames() {
@@ -99,13 +98,6 @@ class Skin {
 		return 'standard';
 	}
 
-	/**
-	 * Get/set accessor for delayed link colouring
-	 */
-	function postParseLinkColour( $setting = NULL ) {
-		return wfSetVar( $this->postParseLinkColour, $setting );
-	}
-
 	function qbSetting() {
 		global $wgOut, $wgUser;
 
@@ -255,7 +247,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' ) ) {
@@ -292,64 +284,6 @@ class Skin {
 		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() . '"';
-		}
-		return $r;
-	}
-
 	/**
 	 * URL to the logo
 	 */
@@ -451,7 +385,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) {
@@ -469,7 +403,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;
 			}
@@ -531,9 +465,12 @@ class Skin {
 		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 )
@@ -746,6 +683,20 @@ 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;
 	}
 
@@ -774,10 +725,8 @@ 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 ( $wgTitle->getArticleId() ) {
@@ -792,8 +741,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 ''; }
@@ -815,6 +764,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();
 	}
 
@@ -899,6 +859,10 @@ 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;
 		require_once('SpecialPage.php');
@@ -1056,7 +1020,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
@@ -1087,6 +1051,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;
 
@@ -1249,290 +1224,6 @@ class Skin {
 		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];
-			}
-		}
-		return "<strong>{$prefix}{$text}{$inside}</strong>{$trail}";
-	}
-
 	/* these are used extensively in SkinPHPTal, but also some other places */
 	/*static*/ function makeSpecialUrl( $name, $urlaction='' ) {
 		$title = Title::makeTitle( NS_SPECIAL, $name );
@@ -1625,1182 +1316,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 = '';
-
-		$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  = '<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 );
-		}
-
-		$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 == '' ) {
-			$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="'.$u.'" /></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();
-
-		$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="'.$u.'" /></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( NS_IMAGE, $name );
-		return $this->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();	
-			$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>";			
-		}
-		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 and !
-			$M = wfMsg( 'minoreditletter' );
-			$N = wfMsg( 'newpageletter' );
-
-			if ( $rc_type == RC_NEW ) {
-				$r .= $N ;
-			} else {
-				$r .= '&nbsp;' ;
-			}
-			if ( $rc_minor ) {
-				$r .= $M ;
-			} else {
-				$r .= '&nbsp;' ;
-			}
-			if ( $rcObj->unpatrolled ) {
-				$r .= '!';
-			} 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 ;
-		$unpatrolled = 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 ;
-			}
-			if ( $rcObj->unpatrolled ) {
-				$unpatrolled = true;
-			}
-			$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" alt="+" /></a></span>' ;
-		$tl .= '<span id="'.$rcl.'" style="display:none"><a href="'.$toggleLink.'"><img src="'.$wgStylePath.'/common/images/Arr_d.png" width="12" height="12" alt="-" /></a></span>' ;
-		$r .= $tl ;
-
-		# Main line
-		# M/N
-		$r .= '<tt>' ;
-		if ( $isnew ) $r .= $N ;
-		else $r .= '&nbsp;' ;
-		$r .= '&nbsp;' ; # Minor
-		if ( $unpatrolled ) {
-			$r .= "!";
-		} else {
-			$r .= "&nbsp;";
-		}
-
-		# 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;' ;
-			}
-
-			if ( $rcObj->unpatrolled ) {
-				$r .= "!";
-			} else {
-				$r .= "&nbsp;";
-			}
-
-			$r .= '&nbsp;</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;
-
-		# Should patrol-related stuff be shown?
-		$unpatrolled = $wgUseRCPatrol && $wgUser->getID() != 0 && 
-		  ( !$wgOnlySysopsCanPatrol || $wgUser->isAllowed('patrol') ) && $rc_patrolled == 0;
-		
-		# 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;
-		}
-
-		$s .= '<li>';
-
-		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 ( $unpatrolled )
-					$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, N and ! (minor, new and unpatrolled)
-			if ( $rc_minor ) { $s .= ' <span class="minor">'.wfMsg( "minoreditletter" ).'</span>'; }
-			if ( $rc_type == RC_NEW ) { $s .= '<span class="newpage">'.wfMsg( "newpageletter" ).'</span>'; }
-			if ( !$rc_patrolled ) { $s .= ' <span class="unpatrolled">!</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 ( $unpatrolled && $rc_type == RC_NEW )
-				$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->isAllowed('block') ) {
-			$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;
-		global $wgUseRCPatrol, $wgOnlySysopsCanPatrol;
-		
-		# 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;
-		}
-		
-		# Should patrol-related stuff be shown?
-		if ( $wgUseRCPatrol && $wgUser->getID() != 0 && 
-		  ( !$wgOnlySysopsCanPatrol || $wgUser->isAllowed('patrol') )) {
-		  	$rc->unpatrolled = !$rc_patrolled;
-		} else {
-			$rc->unpatrolled = false;
-		}
-		
-		# 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 ) . ')';
-		} elseif ( $rc->unpatrolled && $rc_type == RC_NEW ) {
-			# Unpatrolled new page, give rc_id in query
-			$clink = $this->makeKnownLinkObj( $rc->getTitle(), '', "rcid={$rc_id}" );
-		} 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->unpatrolled ) {
-			$rcIdQuery = "&rcid={$rc_id}";
-		} else {
-			$rcIdQuery = '';
-		}
-		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 . $rcIdQuery );
-		}
-
-		# 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->isAllowed('block') ) {
-			$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->isAllowed('delete') ) {
-				$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;
-	}
 }
 
 }