Prevent registration/login with the username "MediaWiki default"
[lhc/web/wiklou.git] / includes / Linker.php
index 25fad56..23c8d01 100644 (file)
  * @package MediaWiki
  */
 class Linker {
-       var $linktrail ; # linktrail regexp
-       var $postParseLinkColour = false;
 
-       /** @todo document */
-       function Linker() {
-               global $wgContLang;
-               $this->linktrail = $wgContLang->linkTrail();
-               
-               # Cache option lookups done very frequently
-               $options = array( 'highlightbroken', 'hover' );
-               foreach( $options as $opt ) {
-                       global $wgUser;
-                       $this->mOptions[$opt] = $wgUser->getOption( $opt );
-               }
-       }
-       
+       function Linker() {}
+
        /**
-        * Get/set accessor for delayed link colouring
+        * @deprecated
         */
-       function postParseLinkColour( $setting = NULL ) {
-               return wfSetVar( $this->postParseLinkColour, $setting );
+       function postParseLinkColour( $s = NULL ) {
+               return NULL;
        }
 
        /** @todo document */
        function getExternalLinkAttributes( $link, $text, $class='' ) {
+               $link = htmlspecialchars( $link );
+
+               $r = ($class != '') ? " class='$class'" : " class='external'";
+
+               $r .= " title=\"{$link}\"";
+               return $r;
+       }
+
+       function getInterwikiLinkAttributes( $link, $text, $class='' ) {
                global $wgContLang;
 
                $same = ($link == $text);
                $link = urldecode( $link );
                $link = $wgContLang->checkTitleEncoding( $link );
-               $link = preg_replace( '/[\\x00-\\x1f_]/', ' ', $link );
+               $link = preg_replace( '/[\\x00-\\x1f]/', ' ', $link );
                $link = htmlspecialchars( $link );
 
                $r = ($class != '') ? " class='$class'" : " class='external'";
 
-               if( !$same && $this->mOptions['hover'] ) {
-                       $r .= " title=\"{$link}\"";
-               }
+               $r .= " title=\"{$link}\"";
                return $r;
        }
 
@@ -71,9 +65,7 @@ class Linker {
                        $r = '';
                }
 
-               if( $this->mOptions['hover'] ) {
-                       $r .= " title=\"{$link}\"";
-               }
+               $r .= " title=\"{$link}\"";
                return $r;
        }
 
@@ -89,73 +81,117 @@ class Linker {
                        $r = '';
                }
 
-               if( $this->mOptions['hover'] ) {
-                       $r .= ' title="' . $nt->getEscapedText() . '"';
-               }
+               $r .= ' title="' . $nt->getEscapedText() . '"';
                return $r;
        }
 
        /**
-        * Note: This function MUST call getArticleID() on the link,
-        * otherwise the cache won't get updated properly.  See LINKCACHE.DOC.
+        * This function is a shortcut to makeLinkObj(Title::newFromText($title),...). Do not call
+        * it if you already have a title object handy. See makeLinkObj for further documentation.
+        *
+        * @param string $title The text of the title
+        * @param string $text Link text
+        * @param string $query Optional query part
+        * @param string $trail Optional trail. Alphabetic characters at the start of this string will
+        *                      be included in the link text. Other characters will be appended after
+        *                      the end of the link.
         */
        function makeLink( $title, $text = '', $query = '', $trail = '' ) {
-               wfProfileIn( 'Skin::makeLink' );
+               wfProfileIn( 'Linker::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" );
+                       wfDebug( 'Invalid title passed to Linker::makeLink(): "'.$title."\"\n" );
                        $result = $text == "" ? $title : $text;
                }
 
-               wfProfileOut( 'Skin::makeLink' );
+               wfProfileOut( 'Linker::makeLink' );
                return $result;
        }
 
-       /** @todo document */
+       /**
+        * This function is a shortcut to makeKnownLinkObj(Title::newFromText($title),...). Do not call
+        * it if you already have a title object handy. See makeKnownLinkObj for further documentation.
+        * 
+        * @param string $title The text of the title
+        * @param string $text Link text
+        * @param string $query Optional query part
+        * @param string $trail Optional trail. Alphabetic characters at the start of this string will
+        *                      be included in the link text. Other characters will be appended after
+        *                      the end of the link.
+        */
        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" );
+                       wfDebug( 'Invalid title passed to Linker::makeKnownLink(): "'.$title."\"\n" );
                        return $text == '' ? $title : $text;
                }
        }
 
-       /** @todo document */
+       /**
+        * This function is a shortcut to makeBrokenLinkObj(Title::newFromText($title),...). Do not call
+        * it if you already have a title object handy. See makeBrokenLinkObj for further documentation.
+        * 
+        * @param string $title The text of the title
+        * @param string $text Link text
+        * @param string $query Optional query part
+        * @param string $trail Optional trail. Alphabetic characters at the start of this string will
+        *                      be included in the link text. Other characters will be appended after
+        *                      the end of the link.
+        */
        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" );
+                       wfDebug( 'Invalid title passed to Linker::makeBrokenLink(): "'.$title."\"\n" );
                        return $text == '' ? $title : $text;
                }
        }
 
-       /** @todo document */
+       /**
+        * This function is a shortcut to makeStubLinkObj(Title::newFromText($title),...). Do not call
+        * it if you already have a title object handy. See makeStubLinkObj for further documentation.
+        * 
+        * @param string $title The text of the title
+        * @param string $text Link text
+        * @param string $query Optional query part
+        * @param string $trail Optional trail. Alphabetic characters at the start of this string will
+        *                      be included in the link text. Other characters will be appended after
+        *                      the end of the link.
+        */
        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" );
+                       wfDebug( 'Invalid title passed to Linker::makeStubLink(): "'.$title."\"\n" );
                        return $text == '' ? $title : $text;
                }
        }
 
        /**
-        * Pass a title object, not a title string
+        * Make a link for a title which may or may not be in the database. If you need to
+        * call this lots of times, pre-fill the link cache with a LinkBatch, otherwise each
+        * call to this will result in a DB query.
+        * 
+        * @param string $title The text of the title
+        * @param string $text Link text
+        * @param string $query Optional query part
+        * @param string $trail Optional trail. Alphabetic characters at the start of this string will
+        *                      be included in the link text. Other characters will be appended after
+        *                      the end of the link.
         */
-       function makeLinkObj( &$nt, $text= '', $query = '', $trail = '', $prefix = '' ) {
-               global $wgOut, $wgUser, $wgLinkHolders;
-               $fname = 'Skin::makeLinkObj';
+       function makeLinkObj( $nt, $text= '', $query = '', $trail = '', $prefix = '' ) {
+               global $wgUser;
+               $fname = 'Linker::makeLinkObj';
                wfProfileIn( $fname );
 
                # Fail gracefully
-               if ( ! isset($nt) ) {
+               if ( ! is_object($nt) ) {
                        # wfDebugDieBacktrace();
                        wfProfileOut( $fname );
                        return "<!-- ERROR -->{$prefix}{$text}{$trail}";
@@ -167,7 +203,7 @@ class Linker {
                        $u = $nt->getFullURL();
                        $link = $nt->getPrefixedURL();
                        if ( '' == $text ) { $text = $nt->getPrefixedText(); }
-                       $style = $this->getExternalLinkAttributes( $link, $text, 'extiw' );
+                       $style = $this->getInterwikiLinkAttributes( $link, $text, 'extiw' );
 
                        $inside = '';
                        if ( '' != $trail ) {
@@ -176,46 +212,29 @@ class Linker {
                                        $trail = $m[2];
                                }
                        }
-                       $t = "<a href=\"{$u}\"{$style}>{$text}{$inside}</a>";
-                       if( $this->postParseLinkColour ) {
-                               # There's no existence check, but this will prevent
-                               # interwiki links from being parsed as external links.
-                               global $wgInterwikiLinkHolders;
-                               $nr = array_push($wgInterwikiLinkHolders, $t);
-                               $retVal = '<!--IWLINK '. ($nr-1) ."-->{$trail}";
-                       } else {
-                               return $t;
-                       }
-               } elseif ( 0 == $ns && "" == $dbkey ) {
-                       # A self-link with a fragment; skip existence check.
-                       $retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
-               } elseif ( ( NS_SPECIAL == $ns ) || ( NS_IMAGE == $ns ) ) {
-                       # These are always shown as existing, currently.
-                       # Special pages don't exist in the database; images may
-                       # occasionally be present when there is no description
-                       # page per se, so we always shown them.
-                       $retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
-               } elseif ( $this->postParseLinkColour ) {
-                       wfProfileIn( $fname.'-postparse' );
-                       # Insert a placeholder, and we'll work out the existence checks
-                       # in a big lump later.
-                       $inside = '';
-                       if ( '' != $trail ) {
-                               if ( preg_match( $this->linktrail, $trail, $m ) ) {
-                                       $inside = $m[1];
-                                       $trail = $m[2];
-                               }
+
+                       # Check for anchors, normalize the anchor
+
+                       $parts = explode( '#', $u, 2 );
+                       if ( count( $parts ) == 2 ) {
+                               $anchor = urlencode( Sanitizer::decodeCharReferences( str_replace(' ', '_', $parts[1] ) ) );
+                               $replacearray = array(
+                                       '%3A' => ':',
+                                       '%' => '.'
+                               );
+                               $u = $parts[0] . '#' .
+                                    str_replace( array_keys( $replacearray ),
+                                                array_values( $replacearray ),
+                                                $anchor );
                        }
 
-                       # These get picked up by Parser::replaceLinkHolders()
-                       $nr = array_push( $wgLinkHolders['namespaces'], $nt->getNamespace() );
-                       $wgLinkHolders['dbkeys'][] = $dbkey;
-                       $wgLinkHolders['queries'][] = $query;
-                       $wgLinkHolders['texts'][] = $prefix.$text.$inside;
-                       $wgLinkHolders['titles'][] =& $nt;
+                       $t = "<a href=\"{$u}\"{$style}>{$text}{$inside}</a>";
 
-                       $retVal = '<!--LINK '. ($nr-1) ."-->{$trail}";
-                       wfProfileOut( $fname.'-postparse' );
+                       wfProfileOut( $fname );
+                       return $t;
+               } elseif ( $nt->isAlwaysKnown() ) {
+                       # Image links, special page links and self-links with fragements are always known.
+                       $retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
                } else {
                        wfProfileIn( $fname.'-immediate' );
                        # Work out link colour immediately
@@ -227,14 +246,13 @@ class Linker {
                                if ( $threshold > 0 ) {
                                        $dbr =& wfGetDB( DB_SLAVE );
                                        $s = $dbr->selectRow(
-                                               array( 'page', 'text' ),
-                                               array( 'LENGTH(old_text) AS x',
+                                               array( 'page' ),
+                                               array( 'page_len',
                                                        'page_namespace',
                                                        'page_is_redirect' ),
-                                               array( 'page_id' => $aid,
-                                                       'old_id = page_latest' ), $fname ) ;
+                                               array( 'page_id' => $aid ), $fname ) ;
                                        if ( $s !== false ) {
-                                               $size = $s->x;
+                                               $size = $s->page_len;
                                                if ( $s->page_is_redirect OR $s->page_namespace != NS_MAIN ) {
                                                        $size = $threshold*2 ; # Really big
                                                }
@@ -257,62 +275,77 @@ class Linker {
        }
 
        /**
-        * Pass a title object, not a title string
+        * Make a link for a title which definitely exists. This is faster than makeLinkObj because
+        * it doesn't have to do a database query. It's also valid for interwiki titles and special
+        * pages.
+        *
+        * @param object $nt Title of target page
+        * @param string $text Text to replace the title
+        * @param string $query Link target
+        * @param string $trail Text after link
+        * @param string $prefix Text before link text
+        * @param string $aprops Extra attributes to the a-element
+        * @param string $style Style to apply - if empty, use getInternalLinkAttributesObj instead
+        * @return the a-element
         */
-       function makeKnownLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '' ) {
-               global $wgOut, $wgTitle, $wgInputEncoding;
+       function makeKnownLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '', $style = '' ) {
 
-               $fname = 'Skin::makeKnownLinkObj';
+               $fname = 'Linker::makeKnownLinkObj';
                wfProfileIn( $fname );
 
                if ( !is_object( $nt ) ) {
-                       wfProfileIn( $fname );
+                       wfProfileOut( $fname );
                        return $text;
                }
-               
+
                $u = $nt->escapeLocalURL( $query );
-               if ( '' != $nt->getFragment() ) {
+               if ( $nt->getFragment() != '' ) {
                        if( $nt->getPrefixedDbkey() == '' ) {
                                $u = '';
                                if ( '' == $text ) {
                                        $text = htmlspecialchars( $nt->getFragment() );
                                }
                        }
-                       $anchor = urlencode( do_html_entity_decode( str_replace(' ', '_', $nt->getFragment()), ENT_COMPAT, $wgInputEncoding ) );
+                       $anchor = urlencode( Sanitizer::decodeCharReferences( str_replace( ' ', '_', $nt->getFragment() ) ) );
                        $replacearray = array(
                                '%3A' => ':',
                                '%' => '.'
                        );
                        $u .= '#' . str_replace(array_keys($replacearray),array_values($replacearray),$anchor);
                }
-               if ( '' == $text ) {
+               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];
-                       }
+               if ( $style == '' ) {
+                       $style = $this->getInternalLinkAttributesObj( $nt, $text );
                }
+
+               if ( $aprops !== '' ) $aprops = ' ' . $aprops;
+
+               list( $inside, $trail ) = Linker::splitTrail( $trail );
                $r = "<a href=\"{$u}\"{$style}{$aprops}>{$prefix}{$text}{$inside}</a>{$trail}";
                wfProfileOut( $fname );
                return $r;
        }
 
        /**
-        * Pass a title object, not a title string
+        * Make a red link to the edit page of a given title.
+        * 
+        * @param string $title The text of the title
+        * @param string $text Link text
+        * @param string $query Optional query part
+        * @param string $trail Optional trail. Alphabetic characters at the start of this string will
+        *                      be included in the link text. Other characters will be appended after
+        *                      the end of the link.
         */
-       function makeBrokenLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
+       function makeBrokenLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
                # Fail gracefully
                if ( ! isset($nt) ) {
                        # wfDebugDieBacktrace();
                        return "<!-- ERROR -->{$prefix}{$text}{$trail}";
                }
 
-               $fname = 'Skin::makeBrokenLinkObj';
+               $fname = 'Linker::makeBrokenLinkObj';
                wfProfileIn( $fname );
 
                if ( '' == $query ) {
@@ -327,27 +360,24 @@ class Linker {
                }
                $style = $this->getInternalLinkAttributesObj( $nt, $text, "yes" );
 
-               $inside = '';
-               if ( '' != $trail ) {
-                       if ( preg_match( $this->linktrail, $trail, $m ) ) {
-                               $inside = $m[1];
-                               $trail = $m[2];
-                       }
-               }
-               if ( $this->mOptions['highlightbroken'] ) {
-                       $s = "<a href=\"{$u}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
-               } else {
-                       $s = "{$prefix}{$text}{$inside}<a href=\"{$u}\"{$style}>?</a>{$trail}";
-               }
+               list( $inside, $trail ) = Linker::splitTrail( $trail );
+               $s = "<a href=\"{$u}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
 
                wfProfileOut( $fname );
                return $s;
        }
 
        /**
-        * Pass a title object, not a title string
+        * Make a brown link to a short article.
+        * 
+        * @param string $title The text of the title
+        * @param string $text Link text
+        * @param string $query Optional query part
+        * @param string $trail Optional trail. Alphabetic characters at the start of this string will
+        *                      be included in the link text. Other characters will be appended after
+        *                      the end of the link.
         */
-       function makeStubLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
+       function makeStubLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
                $link = $nt->getPrefixedURL();
 
                $u = $nt->escapeLocalURL( $query );
@@ -357,34 +387,43 @@ class Linker {
                }
                $style = $this->getInternalLinkAttributesObj( $nt, $text, 'stub' );
 
-               $inside = '';
-               if ( '' != $trail ) {
-                       if ( preg_match( $this->linktrail, $trail, $m ) ) {
-                               $inside = $m[1];
-                               $trail = $m[2];
-                       }
-               }
-               if ( $this->mOptions['highlightbroken'] ) {
-                       $s = "<a href=\"{$u}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
+               list( $inside, $trail ) = Linker::splitTrail( $trail );
+               $s = "<a href=\"{$u}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
+               return $s;
+       }
+
+       /**
+        * Generate either a normal exists-style link or a stub link, depending
+        * on the given page size.
+        *
+        * @param int $size
+        * @param Title $nt
+        * @param string $text
+        * @param string $query
+        * @param string $trail
+        * @param string $prefix
+        * @return string HTML of link
+        */
+       function makeSizeLinkObj( $size, $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
+               global $wgUser;
+               $threshold = intval( $wgUser->getOption( 'stubthreshold' ) );
+               if( $size < $threshold ) {
+                       return $this->makeStubLinkObj( $nt, $text, $query, $trail, $prefix );
                } else {
-                       $s = "{$prefix}{$text}{$inside}<a href=\"{$u}\"{$style}>!</a>{$trail}";
+                       return $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
                }
-               return $s;
        }
 
-       /** @todo document */
-       function makeSelfLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
-               $u = $nt->escapeLocalURL( $query );
+       /** 
+        * Make appropriate markup for a link to the current article. This is currently rendered
+        * as the bold link text. The calling sequence is the same as the other make*LinkObj functions,
+        * despite $query not being used.
+        */
+       function makeSelfLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
                if ( '' == $text ) {
                        $text = htmlspecialchars( $nt->getPrefixedText() );
                }
-               $inside = '';
-               if ( '' != $trail ) {
-                       if ( preg_match( $this->linktrail, $trail, $m ) ) {
-                               $inside = $m[1];
-                               $trail = $m[2];
-                       }
-               }
+               list( $inside, $trail ) = Linker::splitTrail( $trail );
                return "<strong>{$prefix}{$text}{$inside}</strong>{$trail}";
        }
 
@@ -399,9 +438,13 @@ class Linker {
                return htmlspecialchars( $basename );
        }
 
-       /** @todo document */
+       /** Obsolete alias */
        function makeImage( $url, $alt = '' ) {
-               global $wgOut;
+               return $this->makeExternalImage( $url, $alt );
+       }
+
+       /** @todo document */
+       function makeExternalImage( $url, $alt = '' ) {
                if ( '' == $alt ) {
                        $alt = $this->fnamePart( $url );
                }
@@ -410,79 +453,21 @@ class Linker {
        }
 
        /** @todo document */
-       function makeImageLink( $name, $url, $alt = '' ) {
-               $nt = Title::makeTitleSafe( NS_IMAGE, $name );
-               return $this->makeImageLinkObj( $nt, $alt );
-       }
+       function makeImageLinkObj( $nt, $label, $alt, $align = '', $width = false, $height = false, $framed = false,
+         $thumb = false, $manual_thumb = '' )
+       {
+               global $wgContLang, $wgUser, $wgThumbLimits;
+
+               $img   = new Image( $nt );
+               if ( !$img->allowInlineDisplay() && $img->exists() ) {
+                       return $this->makeKnownLinkObj( $nt );
+               }
 
-       /** @todo document */
-       function makeImageLinkObj( $nt, $alt = '' ) {
-               global $wgContLang, $wgUseImageResize;
-               $img   = Image::newFromTitle( $nt );
                $url   = $img->getViewURL();
+               $error = $prefix = $postfix = '';
+
+               wfDebug( "makeImageLinkObj: '$width'x'$height'\n" );
 
-               $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">';
@@ -498,38 +483,72 @@ class Linker {
                        # for right-to-left-languages ("Semitic languages")
                        #
                        # If  thumbnail width has not been provided, it is set
-                       # here to 180 pixels
+                       # to the default user option as specified in Language*.php
                        if ( $align == '' ) {
                                $align = $wgContLang->isRTL() ? 'left' : 'right';
                        }
-                       if ( ! isset($width) ) {
-                               $width = 180;
+
+
+                       if ( $width === false ) {
+                               $wopt = $wgUser->getOption( 'thumbsize' );
+
+                               if( !isset( $wgThumbLimits[$wopt] ) ) {
+                                        $wopt = User::getDefaultOption( 'thumbsize' );
+                               }
+
+                               $width = min( $img->getWidth(), $wgThumbLimits[$wopt] );
                        }
-                       return $prefix.$this->makeThumbLinkObj( $img, $alt, $align, $width, $height, $framed, $manual_thumb ).$postfix;
 
-               } elseif ( isset($width) ) {
+                       return $prefix.$this->makeThumbLinkObj( $img, $label, $alt, $align, $width, $height, $framed, $manual_thumb ).$postfix;
+               }
+
+               if ( $width && $img->exists() ) {
 
                        # 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 ( $height == false )
+                               $height = -1;
+                       if ( $manual_thumb == '') {
+                               $thumb = $img->getThumbnail( $width, $height );
+                               if ( $thumb ) {
+                                       // In most cases, $width = $thumb->width or $height = $thumb->height.
+                                       // If not, we're scaling the image larger than it can be scaled,
+                                       // so we send to the browser a smaller thumbnail, and let the client do the scaling.
+
+                                       if ($height != -1 && $width > $thumb->width * $height / $thumb->height) {
+                                               // $height is the limiting factor, not $width
+                                               // set $width to the largest it can be, such that the resulting
+                                               // scaled height is at most $height
+                                               $width = floor($thumb->width * $height / $thumb->height);
+                                       }
+                                       $height = round($thumb->height * $width / $thumb->width);
+
+                                       wfDebug( "makeImageLinkObj: client-size set to '$width x $height'\n" );
+                                       $url = $thumb->getUrl();
+                               } else {
+                                       $error = htmlspecialchars( $img->getLastError() );
+                               }
                        }
-                       if ( '' == $manual_thumb ) $url = $img->createThumb( $width );
+               } else {
+                       $width = $img->width;
+                       $height = $img->height;
                }
 
-               $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 );
-
+               wfDebug( "makeImageLinkObj2: '$width'x'$height'\n" );
                $u = $nt->escapeLocalURL();
-               if ( $url == '' ) {
-                       $s = wfMsg( 'missingimage', $img->getName() );
-                       $s .= "<br />{$alt}<br />{$url}<br />\n";
+               if ( $error ) {
+                       $s = $error;
+               } elseif ( $url == '' ) {
+                       $s = $this->makeBrokenImageLinkObj( $img->getTitle() );
+                       //$s .= "<br />{$alt}<br />{$url}<br />\n";
                } else {
                        $s = '<a href="'.$u.'" class="image" title="'.$alt.'">' .
-                                '<img src="'.$url.'" alt="'.$alt.'" longdesc="'.$u.'" /></a>';
+                                '<img src="'.$url.'" alt="'.$alt.'" ' .
+                                ( $width
+                                       ? ( 'width="'.$width.'" height="'.$height.'" ' )
+                                       : '' ) .
+                                'longdesc="'.$u.'" /></a>';
                }
                if ( '' != $align ) {
                        $s = "<div class=\"float{$align}\"><span>{$s}</span></div>";
@@ -541,53 +560,48 @@ class Linker {
         * 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 = "" ) {
+       function makeThumbLinkObj( $img, $label = '', $alt, $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 );
+               $thumbUrl = '';
+               $error = '';
 
                $width = $height = 0;
-               if ( $img->exists() )
-               {
+               if ( $img->exists() ) {
                        $width  = $img->getWidth();
                        $height = $img->getHeight();
                }
-               if ( 0 == $width || 0 == $height )
-               {
-                       $width = $height = 200;
+               if ( 0 == $width || 0 == $height ) {
+                       $width = $height = 180;
                }
-               if ( $boxwidth == 0 )
-               {
-                       $boxwidth = 200;
+               if ( $boxwidth == 0 ) {
+                       $boxwidth = 180;
                }
-               if ( $framed )
-               {
+               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 ( $boxheight === false )
+                               $boxheight = -1;
+                       if ( '' == $manual_thumb ) {
+                               $thumb = $img->getThumbnail( $boxwidth, $boxheight );
+                               if ( $thumb ) {
+                                       $thumbUrl = $thumb->getUrl();
+                                       $boxwidth = $thumb->width;
+                                       $boxheight = $thumb->height;
+                               } else {
+                                       $error = $img->getLastError();
+                               }
                        }
-                       if ( '' == $manual_thumb ) $thumbUrl = $img->createThumb( $boxwidth );
                }
+               $oboxwidth = $boxwidth + 2;
 
                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 );
+                       $manual_img = new Image( $manual_title );
                        $thumbUrl = $manual_img->getViewURL();
                        if ( $manual_img->exists() )
                        {
@@ -606,8 +620,15 @@ class Linker {
                $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() );
+               if( $thumbUrl == '' ) {
+                       // Couldn't generate thumbnail? Scale the image client-side.
+                       $thumbUrl = $url;
+               }
+               if ( $error ) {
+                       $s .= htmlspecialchars( $error );
+                       $zoomicon = '';
+               } elseif( !$img->exists() ) {
+                       $s .= $this->makeBrokenImageLinkObj( $img->getTitle() );
                        $zoomicon = '';
                } else {
                        $s .= '<a href="'.$u.'" class="internal" title="'.$alt.'">'.
@@ -627,34 +648,77 @@ class Linker {
                return str_replace("\n", ' ', $s);
        }
 
+       /**
+        * Pass a title object, not a title string
+        */
+       function makeBrokenImageLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
+               # Fail gracefully
+               if ( ! isset($nt) ) {
+                       # wfDebugDieBacktrace();
+                       return "<!-- ERROR -->{$prefix}{$text}{$trail}";
+               }
+
+               $fname = 'Linker::makeBrokenImageLinkObj';
+               wfProfileIn( $fname );
+
+               $q = 'wpDestFile=' . urlencode( $nt->getDBkey() );
+               if ( '' != $query ) {
+                       $q .= "&$query";
+               }
+               $uploadTitle = Title::makeTitle( NS_SPECIAL, 'Upload' );
+               $url = $uploadTitle->escapeLocalURL( $q );
+
+               if ( '' == $text ) {
+                       $text = htmlspecialchars( $nt->getPrefixedText() );
+               }
+               $style = $this->getInternalLinkAttributesObj( $nt, $text, "yes" );
+               list( $inside, $trail ) = Linker::splitTrail( $trail );
+               $s = "<a href=\"{$url}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
+
+               wfProfileOut( $fname );
+               return $s;
+       }
+
        /** @todo document */
-       function makeMediaLink( $name, $url, $alt = '' ) {
+       function makeMediaLink( $name, /* wtf?! */ $url, $alt = '' ) {
                $nt = Title::makeTitleSafe( NS_IMAGE, $name );
                return $this->makeMediaLinkObj( $nt, $alt );
        }
 
-       /** @todo document */
-       function makeMediaLinkObj( $nt, $alt = '', $nourl=false ) {             
-               if ( ! isset( $nt ) )
-               {
+       /**
+        * Create a direct link to a given uploaded file.
+        *
+        * @param Title  $title
+        * @param string $text   pre-sanitized HTML
+        * @param bool   $nourl  Mask absolute URLs, so the parser doesn't
+        *                       linkify them (it is currently not context-aware)
+        * @return string HTML
+        *
+        * @access public
+        * @todo Handle invalid or missing images better.
+        */
+       function makeMediaLinkObj( $title, $text = '' ) {
+               if( is_null( $title ) ) {
                        ### HOTFIX. Instead of breaking, return empty string.
-                       $s = $alt;
+                       return $text;
                } 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 );
+                       $name = $title->getDBKey();
+                       $img  = new Image( $title );
+                       if( $img->exists() ) {
+                               $url  = $img->getURL();
+                               $class = 'internal';
+                       } else {
+                               $upload = Title::makeTitle( NS_SPECIAL, 'Upload' );
+                               $url = $upload->getLocalUrl( 'wpDestFile=' . urlencode( $img->getName() ) );
+                               $class = 'new';
+                       }
+                       $alt = htmlspecialchars( $title->getText() );
+                       if( $text == '' ) {
+                               $text = $alt;
                        }
                        $u = htmlspecialchars( $url );
-                       $s = "<a href=\"{$u}\" class='internal' title=\"{$alt}\">{$alt}</a>";                   
+                       return "<a href=\"{$u}\" class='$class' title=\"{$alt}\">{$text}</a>";
                }
-               return $s;
        }
 
        /** @todo document */
@@ -681,13 +745,127 @@ class Linker {
                return '<a href="'.$url.'"'.$style.'>'.$text.'</a>';
        }
 
+       /**
+        * Make user link (or user contributions for unregistered users)
+        * @param int $userId
+        * @param string $userText
+        * @return string HTML fragment
+        * @access private
+        */
+       function userLink( $userId, $userText ) {
+               $encName = htmlspecialchars( $userText );
+               if( $userId == 0 ) {
+                       $contribsPage = Title::makeTitle( NS_SPECIAL, 'Contributions' );
+                       return $this->makeKnownLinkObj( $contribsPage,
+                               $encName, 'target=' . urlencode( $userText ) );
+               } else {
+                       $userPage = Title::makeTitle( NS_USER, $userText );
+                       return $this->makeLinkObj( $userPage, $encName );
+               }
+       }
+
+       /**
+        * @param int $userId
+        * @param string $userText
+        * @return string HTML fragment with talk and/or block links
+        * @access private
+        */
+       function userToolLinks( $userId, $userText ) {
+               global $wgUser, $wgDisableAnonTalk, $wgSysopUserBans;
+               $talkable = !( $wgDisableAnonTalk && 0 == $userId );
+               $blockable = ( $wgSysopUserBans || 0 == $userId );
+
+               $items = array();
+               if( $talkable ) {
+                       $items[] = $this->userTalkLink( $userId, $userText );
+               }
+               if( $userId ) {
+                       $contribsPage = Title::makeTitle( NS_SPECIAL, 'Contributions' );
+                       $items[] = $this->makeKnownLinkObj( $contribsPage,
+                               wfMsgHtml( 'contribslink' ), 'target=' . urlencode( $userText ) );
+               }
+               if( $blockable && $wgUser->isAllowed( 'block' ) ) {
+                       $items[] = $this->blockLink( $userId, $userText );
+               }
+
+               if( $items ) {
+                       return ' (' . implode( ' | ', $items ) . ')';
+               } else {
+                       return '';
+               }
+       }
+
+       /**
+        * @param int $userId
+        * @param string $userText
+        * @return string HTML fragment with user talk link
+        * @access private
+        */
+       function userTalkLink( $userId, $userText ) {
+               global $wgContLang;
+               $talkname = $wgContLang->getNsText( NS_TALK ); # use the shorter name
+
+               $userTalkPage = Title::makeTitle( NS_USER_TALK, $userText );
+               $userTalkLink = $this->makeLinkObj( $userTalkPage, $talkname );
+               return $userTalkLink;
+       }
+
+       /**
+        * @param int $userId
+        * @param string $userText
+        * @return string HTML fragment with block link
+        * @access private
+        */
+       function blockLink( $userId, $userText ) {
+               $blockPage = Title::makeTitle( NS_SPECIAL, 'Blockip' );
+               $blockLink = $this->makeKnownLinkObj( $blockPage,
+                       wfMsgHtml( 'blocklink' ), 'ip=' . urlencode( $userText ) );
+               return $blockLink;
+       }
+       
+       /**
+        * Generate a user link if the current user is allowed to view it
+        * @param Revision $rev
+        * @return string HTML
+        */
+       function revUserLink( $rev ) {
+               if( $rev->userCan( MW_REV_DELETED_USER ) ) {
+                       $link = $this->userLink( $rev->getRawUser(), $rev->getRawUserText() );
+               } else {
+                       $link = wfMsgHtml( 'rev-deleted-user' );
+               }
+               if( $rev->isDeleted( MW_REV_DELETED_USER ) ) {
+                       return '<span class="history-deleted">' . $link . '</span>';
+               }
+               return $link;
+       }
+
+       /**
+        * Generate a user tool link cluster if the current user is allowed to view it
+        * @param Revision $rev
+        * @return string HTML
+        */
+       function revUserTools( $rev ) {
+               if( $rev->userCan( MW_REV_DELETED_USER ) ) {
+                       $link = $this->userLink( $rev->getRawUser(), $rev->getRawUserText() ) .
+                               ' ' .
+                               $this->userToolLinks( $rev->getRawUser(), $rev->getRawUserText() );
+               } else {
+                       $link = wfMsgHtml( 'rev-deleted-user' );
+               }
+               if( $rev->isDeleted( MW_REV_DELETED_USER ) ) {
+                       return '<span class="history-deleted">' . $link . '</span>';
+               }
+               return $link;
+       }
+       
        /**
         * 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
+        * 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>
         *
@@ -696,10 +874,11 @@ class Linker {
         * temporarily to a value pass. Should be adjusted further. --brion
         */
        function formatComment($comment, $title = NULL) {
-               $fname = 'Skin::formatComment';
+               $fname = 'Linker::formatComment';
                wfProfileIn( $fname );
-               
+
                global $wgContLang;
+               $comment = str_replace( "\n", " ", $comment );
                $comment = htmlspecialchars( $comment );
 
                # The pattern for autogen comments is / * foo * /, which makes for
@@ -711,14 +890,15 @@ class Linker {
                        $auto=$match[2];
                        $post=$match[3];
                        $link='';
-                       if($title) {
-                               $section=$auto;
+                       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'));
+                               $section = str_replace( '[[', '', $section );
+                               $section = str_replace( ']]', '', $section );
+                               $sectionTitle = wfClone( $title );
+                               $sectionTitle->mFragment = $section;
+                               $link = $this->makeKnownLinkObj( $sectionTitle, wfMsg( 'sectionlink' ) );
                        }
                        $sep='-';
                        $auto=$link.$auto;
@@ -730,7 +910,7 @@ class Linker {
 
                # format regular and media links - all other wiki formatting
                # is ignored
-               $medians = $wgContLang->getNsText(Namespace::getMedia()).':';
+               $medians = $wgContLang->getNsText( NS_MEDIA ) . ':';
                while(preg_match('/\[\[(.*?)(\|(.*?))*\]\](.*)$/',$comment,$match)) {
                        # Handle link renaming [[foo|text]] will show link as "text"
                        if( "" != $match[3] ) {
@@ -744,7 +924,7 @@ class Linker {
                                $thelink = $this->makeMediaLink( $submatch[1], "", $text );
                        } else {
                                # Other kind of link
-                               if( preg_match( wfMsgForContent( "linktrail" ), $match[4], $submatch ) ) {
+                               if( preg_match( $wgContLang->linkTrail(), $match[4], $submatch ) ) {
                                        $trail = $submatch[1];
                                } else {
                                        $trail = "";
@@ -754,12 +934,52 @@ class Linker {
                                        $match[1] = substr($match[1], 1);
                                $thelink = $this->makeLink( $match[1], $text, "", $trail );
                        }
-                       $comment = preg_replace( $linkRegexp, $thelink, $comment, 1 );
+                       $comment = preg_replace( $linkRegexp, wfRegexReplacement( $thelink ), $comment, 1 );
                }
                wfProfileOut( $fname );
                return $comment;
        }
 
+       /**
+        * Wrap a comment in standard punctuation and formatting if
+        * it's non-empty, otherwise return empty string.
+        *
+        * @param string $comment
+        * @param Title $title
+        *
+        * @return string
+        */
+       function commentBlock( $comment, $title = NULL ) {
+               // '*' used to be the comment inserted by the software way back
+               // in antiquity in case none was provided, here for backwards
+               // compatability, acc. to brion -ævar
+               if( $comment == '' || $comment == '*' ) {
+                       return '';
+               } else {
+                       $formatted = $this->formatComment( $comment, $title );
+                       return " <span class='comment'>($formatted)</span>";
+               }
+       }
+       
+       /**
+        * Wrap and format the given revision's comment block, if the current
+        * user is allowed to view it.
+        * @param Revision $rev
+        * @return string HTML
+        */
+       function revComment( $rev ) {
+               if( $rev->userCan( MW_REV_DELETED_COMMENT ) ) {
+                       $block = $this->commentBlock( $rev->getRawComment(), $rev->getTitle() );
+               } else {
+                       $block = " <span class='comment'>" .
+                               wfMsgHtml( 'rev-deleted-comment' ) . "</span>";
+               }
+               if( $rev->isDeleted( MW_REV_DELETED_COMMENT ) ) {
+                       return " <span class='history-deleted'>$block</span>";
+               }
+               return $block;
+       }
+
        /** @todo document */
        function tocIndent() {
                return "\n<ul>";
@@ -774,7 +994,10 @@ class Linker {
         * parameter level defines if we are on an indentation level
         */
        function tocLine( $anchor, $tocline, $tocnumber, $level ) {
-               return "\n<li class='toclevel-$level'><a href=\"#" . $anchor . '"><span class="tocnumber">' . $tocnumber . '</span> <span class="toctext">' . $tocline . '</span></a>';
+               return "\n<li class='toclevel-$level'><a href=\"#" .
+                       $anchor . '"><span class="tocnumber">' .
+                       $tocnumber . '</span> <span class="toctext">' .
+                       $tocline . '</span></a>';
        }
 
        /** @todo document */
@@ -784,48 +1007,31 @@ class Linker {
 
        /** @todo document */
        function tocList($toc) {
-               return "<div id='toc'>\n" 
-                          . "<div id='toctitle'><h2>" . wfMsg('toc') . "</h2></div>\n"
-                    . $toc
-                                . "</ul>\n</div>\n"
-                                . '<script type="text/javascript">'
-                                . ' if (window.showTocToggle) {'
-                                . ' var tocShowText = "' . addslashes( wfMsg('showtoc') ) . '";'
-                                . ' var tocHideText = "' . addslashes( wfMsg('hidetoc') ) . '"; '
-                                . ' showTocToggle();'
-                                . ' } '
-                                . '</script>'
-                                . "<div class='visualClear'></div>\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>';
-       }
-
-       /** @todo document */
-       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>';
+               global $wgJsMimeType;
+               $title =  wfMsgForContent('toc') ;
+               return
+                  '<table id="toc" class="toc" summary="' . $title .'"><tr><td>'
+                . '<div id="toctitle"><h2>' . $title . "</h2></div>\n"
+                . $toc
+                # no trailing newline, script should not be wrapped in a
+                # paragraph
+                . "</ul>\n</td></tr></table>"
+                . '<script type="' . $wgJsMimeType . '">'
+                . ' if (window.showTocToggle) {'
+                . ' var tocShowText = "' . wfEscapeJsString( wfMsgForContent('showtoc') ) . '";'
+                . ' var tocHideText = "' . wfEscapeJsString( wfMsgForContent('hidetoc') ) . '";'
+                . ' showTocToggle();'
+                . ' } '
+                . "</script>\n";
        }
 
        /** @todo document */
        function editSectionLinkForOther( $title, $section ) {
-               global $wgRequest;
                global $wgContLang;
 
-               $title = Title::newFromText($title);
+               $title = Title::newFromText( $title );
                $editurl = '&section='.$section;
-               $url = $this->makeKnownLink($title->getPrefixedText(),wfMsg('editsection'),'action=edit'.$editurl);
+               $url = $this->makeKnownLinkObj( $title, wfMsg('editsection'), 'action=edit'.$editurl );
 
                if( $wgContLang->isRTL() ) {
                        $farside = 'left';
@@ -838,20 +1044,17 @@ class Linker {
 
        }
 
-       /** @todo document */
-       function editSectionLink( $nt, $section ) {
-               global $wgRequest;
+       /** 
+        * @param Title $title
+        * @param integer $section
+        * @param string $hint Link title, or default if omitted or empty
+        */
+       function editSectionLink( $nt, $section, $hint='' ) {
                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);
+               $hint = ( $hint=='' ) ? '' : ' title="' . wfMsgHtml( 'editsectionhint', htmlspecialchars( $hint ) ) . '"';
+               $url = $this->makeKnownLinkObj( $nt, wfMsg('editsection'), 'action=edit'.$editurl, '', '', '',  $hint );
 
                if( $wgContLang->isRTL() ) {
                        $farside = 'left';
@@ -862,5 +1065,28 @@ class Linker {
                }
                return "<div class=\"editsection\" style=\"float:$farside;margin-$nearside:5px;\">[".$url."]</div>";
        }
+
+       /**
+        * Split a link trail, return the "inside" portion and the remainder of the trail
+        * as a two-element array
+        *
+        * @static
+        */
+       function splitTrail( $trail ) {
+               static $regex = false;
+               if ( $regex === false ) {
+                       global $wgContLang;
+                       $regex = $wgContLang->linkTrail();
+               }
+               $inside = '';
+               if ( '' != $trail ) {
+                       if ( preg_match( $regex, $trail, $m ) ) {
+                               $inside = $m[1];
+                               $trail = $m[2];
+                       }
+               }
+               return array( $inside, $trail );
+       }
+
 }
 ?>