* Fixed a typo that caused warnings
[lhc/web/wiklou.git] / includes / Linker.php
index 3edca4b..3f35d9c 100644 (file)
@@ -1,11 +1,13 @@
 <?php
-
 /**
  * Split off some of the internal bits from Skin.php.
  * These functions are used for primarily page content:
  * links, embedded images, table of contents. Links are
  * also used in the skin.
- *
+ * @package MediaWiki
+ */
+
+/**
  * For the moment, Skin is a descendent class of Linker.
  * In the future, it should probably be further split
  * so that ever other bit of the wiki doesn't have to
  *
  * @package MediaWiki
  */
-
 class Linker {
-       var $linktrail ; # linktrail regexp
-       var $postParseLinkColour = false;
 
-       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='' ) {
                global $wgContLang;
 
@@ -48,12 +38,11 @@ class Linker {
 
                $r = ($class != '') ? " class='$class'" : " class='external'";
 
-               if( !$same && $this->mOptions['hover'] ) {
-                       $r .= " title=\"{$link}\"";
-               }
+               $r .= " title=\"{$link}\"";
                return $r;
        }
 
+       /** @todo document */
        function getInternalLinkAttributes( $link, $text, $broken = false ) {
                $link = urldecode( $link );
                $link = str_replace( '_', ' ', $link );
@@ -67,9 +56,7 @@ class Linker {
                        $r = '';
                }
 
-               if( $this->mOptions['hover'] ) {
-                       $r .= " title=\"{$link}\"";
-               }
+               $r .= " title=\"{$link}\"";
                return $r;
        }
 
@@ -85,9 +72,7 @@ class Linker {
                        $r = '';
                }
 
-               if( $this->mOptions['hover'] ) {
-                       $r .= ' title="' . $nt->getEscapedText() . '"';
-               }
+               $r .= ' title="' . $nt->getEscapedText() . '"';
                return $r;
        }
 
@@ -96,45 +81,48 @@ class Linker {
         * otherwise the cache won't get updated properly.  See LINKCACHE.DOC.
         */
        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 */
        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 */
        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 */
        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;
                }
        }
@@ -142,13 +130,13 @@ class Linker {
        /**
         * Pass a title object, not a title string
         */
-       function makeLinkObj( &$nt, $text= '', $query = '', $trail = '', $prefix = '' ) {
-               global $wgOut, $wgUser, $wgLinkHolders;
-               $fname = 'Skin::makeLinkObj';
+       function makeLinkObj( $nt, $text= '', $query = '', $trail = '', $prefix = '' ) {
+               global $wgOut, $wgUser;
+               $fname = 'Linker::makeLinkObj';
                wfProfileIn( $fname );
 
                # Fail gracefully
-               if ( ! isset($nt) ) {
+               if ( ! is_object($nt) ) {
                        # wfDebugDieBacktrace();
                        wfProfileOut( $fname );
                        return "<!-- ERROR -->{$prefix}{$text}{$trail}";
@@ -169,46 +157,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];
-                               }
-                       }
 
-                       # 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;
+                       # 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 );
+                       }
 
-                       $retVal = '<!--LINK '. ($nr-1) ."-->{$trail}";
-                       wfProfileOut( $fname.'-postparse' );
+                       $t = "<a href=\"{$u}\"{$style}>{$text}{$inside}</a>";
+                               
+                       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
@@ -219,11 +190,15 @@ class Linker {
                                $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 ) ;
+                                       $s = $dbr->selectRow(
+                                               array( 'page' ),
+                                               array( 'page_len',
+                                                       'page_namespace',
+                                                       'page_is_redirect' ),
+                                               array( 'page_id' => $aid ), $fname ) ;
                                        if ( $s !== false ) {
-                                               $size = $s->x;
-                                               if ( $s->cur_is_redirect OR $s->cur_namespace != NS_MAIN ) {
+                                               $size = $s->page_len;
+                                               if ( $s->page_is_redirect OR $s->page_namespace != NS_MAIN ) {
                                                        $size = $threshold*2 ; # Really big
                                                }
                                        } else {
@@ -247,14 +222,14 @@ class Linker {
        /**
         * Pass a title object, not a title string
         */
-       function makeKnownLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '' ) {
-               global $wgOut, $wgTitle, $wgInputEncoding;
+       function makeKnownLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '' ) {
+               global $wgOut, $wgTitle;
 
-               $fname = 'Skin::makeKnownLinkObj';
+               $fname = 'Linker::makeKnownLinkObj';
                wfProfileIn( $fname );
 
                if ( !is_object( $nt ) ) {
-                       wfProfileIn( $fname );
+                       wfProfileOut( $fname );
                        return $text;
                }
                
@@ -266,7 +241,7 @@ class Linker {
                                        $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' => ':',
                                '%' => '.'
@@ -277,14 +252,8 @@ class Linker {
                        $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];
-                       }
-               }
+               
+               list( $inside, $trail ) = Linker::splitTrail( $trail );
                $r = "<a href=\"{$u}\"{$style}{$aprops}>{$prefix}{$text}{$inside}</a>{$trail}";
                wfProfileOut( $fname );
                return $r;
@@ -293,14 +262,14 @@ class Linker {
        /**
         * Pass a title object, not a title string
         */
-       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 ) {
@@ -314,19 +283,9 @@ class Linker {
                        $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 ( $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;
@@ -335,7 +294,7 @@ class Linker {
        /**
         * Pass a title object, not a title string
         */
-       function makeStubLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
+       function makeStubLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
                $link = $nt->getPrefixedURL();
 
                $u = $nt->escapeLocalURL( $query );
@@ -345,36 +304,44 @@ 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;
        }
 
-       function makeSelfLinkObj( &$nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
+       /** @todo document */
+       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];
-                       }
-               }
+               list( $inside, $trail ) = Linker::splitTrail( $trail );
                return "<strong>{$prefix}{$text}{$inside}</strong>{$trail}";
        }
 
+       /** @todo document */
        function fnamePart( $url ) {
                $basename = strrchr( $url, '/' );
                if ( false === $basename ) {
@@ -385,7 +352,13 @@ class Linker {
                return htmlspecialchars( $basename );
        }
 
+       /** Obsolete alias */
        function makeImage( $url, $alt = '' ) {
+               return $this->makeExternalImage( $url, $alt );
+       }
+
+       /** @todo document */
+       function makeExternalImage( $url, $alt = '' ) {
                global $wgOut;
                if ( '' == $alt ) {
                        $alt = $this->fnamePart( $url );
@@ -394,78 +367,18 @@ class Linker {
                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 );
+       /** @todo document */
+       function makeImageLinkObj( $nt, $label, $alt, $align = '', $width = false, $height = false, $framed = false, 
+         $thumb = false, $manual_thumb = '' ) 
+       {
+               global $wgContLang, $wgUser, $wgThumbLimits;
+               
+               $img   = new Image( $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;
-                       }
-               }
+               
+               wfDebug( "makeImageLinkObj: '$width'x'$height'\n" );
+               
                if ( 'center' == $align )
                {
                        $prefix  = '<div class="center">';
@@ -481,38 +394,64 @@ 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 = $wgThumbLimits[$wopt];
                        }
-                       return $prefix.$this->makeThumbLinkObj( $img, $alt, $align, $width, $height, $framed, $manual_thumb ).$postfix;
+                       
+                       return $prefix.$this->makeThumbLinkObj( $img, $label, $alt, $align, $width, $height, $framed, $manual_thumb ).$postfix;
 
-               } elseif ( isset($width) ) {
+               } elseif ( $width ) {
 
                        # Create a resized image, without the additional thumbnail
                        # features
 
-                       if (    ( ! $height === false )
-                            && ( $img->getHeight() * $width / $img->getWidth() > $height ) ) {
+                       if ( $height !== false && ( $img->getHeight() * $width / $img->getWidth() > $height ) ) {
                                $width = $img->getWidth() * $height / $img->getHeight();
                        }
-                       if ( '' == $manual_thumb ) $url = $img->createThumb( $width );
+                       if ( $manual_thumb == '') {
+                               $thumb = $img->getThumbnail( $width );
+                               if ( $thumb ) {
+                                       if( $width > $thumb->width ) {
+                                               // Requested a display size larger than the actual image;
+                                               // fake it up!
+                                               $height = floor($thumb->height * $width / $thumb->width);
+                                               wfDebug( "makeImageLinkObj: client-size height set to '$height'\n" );
+                                       } else {
+                                               $height = $thumb->height;
+                                               wfDebug( "makeImageLinkObj: thumb height set to '$height'\n" );
+                                       }
+                                       $url = $thumb->getUrl();
+                               }
+                       }
+               } 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";
+                       $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>";
@@ -524,16 +463,10 @@ 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 );
-
                $width = $height = 0;
                if ( $img->exists() )
                {
@@ -556,7 +489,7 @@ class Linker {
                        $boxheight = $height;
                        $thumbUrl  = $url;
                } else {
-                       $h  = intval( $height/($width/$boxwidth) );
+                       $h  = round( $height/($width/$boxwidth) );
                        $oboxwidth = $boxwidth + 2;
                        if ( ( ! $boxheight === false ) &&  ( $h > $boxheight ) )
                        {
@@ -570,7 +503,7 @@ class Linker {
                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() )
                        {
@@ -590,7 +523,7 @@ class Linker {
 
                $s = "<div class=\"thumb t{$align}\"><div style=\"width:{$oboxwidth}px;\">";
                if ( $thumbUrl == '' ) {
-                       $s .= wfMsg( 'missingimage', $img->getName() );
+                       $s .= $this->makeBrokenImageLinkObj( $img->getTitle() );
                        $zoomicon = '';
                } else {
                        $s .= '<a href="'.$u.'" class="internal" title="'.$alt.'">'.
@@ -609,35 +542,84 @@ class Linker {
                $s .= '  <div class="thumbcaption" '.$textalign.'>'.$zoomicon.$label."</div></div></div>";
                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 = '' ) {
                $nt = Title::makeTitleSafe( NS_IMAGE, $name );
                return $this->makeMediaLinkObj( $nt, $alt );
        }
 
-       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 = '', $nourl=false ) {
+               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();
+                               if( $nourl ) {
+                                       $url = str_replace( "http://", "http-noparse://", $url );
+                               }
+                               $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 */
        function specialLink( $name, $key = '' ) {
                global $wgContLang;
 
@@ -647,6 +629,7 @@ class Linker {
                  wfMsg( $key ) );
        }
 
+       /** @todo document */
        function makeExternalLink( $url, $text, $escape = true, $linktype = '' ) {
                $style = $this->getExternalLinkAttributes( $url, $text, 'external ' . $linktype );
                global $wgNoFollowLinks;
@@ -675,10 +658,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
@@ -709,7 +693,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] ) {
@@ -739,10 +723,30 @@ class Linker {
                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
+        * @access public
+        */
+       function commentBlock( $comment, $title = NULL ) {
+               if( $comment == '' || $comment == '*' ) {
+                       return '';
+               } else {
+                       $formatted = $this->formatComment( $comment, $title );
+                       return " <span class='comment'>($formatted)</span>";
+               }
+       }
+
+       /** @todo document */
        function tocIndent() {
                return "\n<ul>";
        }
 
+       /** @todo document */
        function tocUnindent($level) {
                return "</li>\n" . str_repeat( "</ul>\n</li>\n", $level>0 ? $level : 0 );
        }
@@ -751,48 +755,34 @@ 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>';
        }
 
-       function tocLineEnd()
-       {
+       /** @todo document */
+       function tocLineEnd() {
                return "</li>\n";
        }
 
+       /** @todo document */
        function tocList($toc) {
-               return "<div id='toc'>\n" 
-                          . "<div id='toctitle'><h2>" . wfMsg('toc') . "</h2></div>\n"
+               global $wgJsMimeType;
+               return "<table id='toc' class='toc'><tr><td>" 
+                          . "<div id='toctitle'><h2>" . wfMsgForContent('toc') . "</h2></div>\n"
                     . $toc
-                                . "</ul>\n</div>\n"
-                                . '<script type="text/javascript">'
+                                . "</ul>\n</td></tr></table>\n"
+                                . '<script type="'.$wgJsMimeType.'">'
                                 . ' if (window.showTocToggle) {'
-                                . ' var tocShowText = "' . addslashes( wfMsg('showtoc') ) . '";'
-                                . ' var tocHideText = "' . addslashes( wfMsg('hidetoc') ) . '"; '
+                                . ' var tocShowText = "' . wfEscapeJsString( wfMsgForContent('showtoc') ) . '";'
+                                . ' var tocHideText = "' . wfEscapeJsString( wfMsgForContent('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>';
-       }
-
-       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>';
+                                . "</script>\n";
        }
 
+       /** @todo document */
        function editSectionLinkForOther( $title, $section ) {
                global $wgRequest;
                global $wgContLang;
@@ -812,17 +802,10 @@ class Linker {
 
        }
 
+       /** @todo document */
        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);
 
@@ -834,9 +817,29 @@ class Linker {
                        $nearside = 'left';
                }
                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 );
        }
 
 }
-
-?>
\ No newline at end of file
+?>