(bug 10672) Make Linker::doEditSectionLink protected, not private
[lhc/web/wiklou.git] / includes / Linker.php
index 5662252..56377fa 100644 (file)
@@ -4,14 +4,12 @@
  * These functions are used for primarily page content:
  * links, embedded images, table of contents. Links are
  * also used in the skin.
- */
-
-/**
  * 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
  * go loading up Skin to get at it.
  *
+ * @addtogroup Skins
  */
 class Linker {
        function __construct() {}
@@ -220,32 +218,39 @@ class Linker {
                        $retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
                } else {
                        wfProfileIn( $fname.'-immediate' );
+
+                       # Handles links to special pages wich do not exist in the database:
+                       if( $nt->getNamespace() == NS_SPECIAL ) {
+                               if( SpecialPage::exists( $nt->getDbKey() ) ) {
+                                       $retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
+                               } else {
+                                       $retVal = $this->makeBrokenLinkObj( $nt, $text, $query, $trail, $prefix );
+                               }
+                               wfProfileOut( $fname.'-immediate' );
+                               wfProfileOut( $fname );
+                               return $retVal;
+                       }
+
                        # Work out link colour immediately
                        $aid = $nt->getArticleID() ;
                        if ( 0 == $aid ) {
                                $retVal = $this->makeBrokenLinkObj( $nt, $text, $query, $trail, $prefix );
                        } else {
-                               $threshold = $wgUser->getOption('stubthreshold') ;
-                               if ( $threshold > 0 ) {
-                                       $dbr = wfGetDB( DB_SLAVE );
-                                       $s = $dbr->selectRow(
-                                               array( 'page' ),
-                                               array( 'page_len',
-                                                       'page_namespace',
-                                                       'page_is_redirect' ),
-                                               array( 'page_id' => $aid ), $fname ) ;
-                                       if ( $s !== false ) {
-                                               $size = $s->page_len;
-                                               if ( $s->page_is_redirect OR $s->page_namespace != NS_MAIN ) {
-                                                       $size = $threshold*2 ; # Really big
-                                               }
-                                       } else {
-                                               $size = $threshold*2 ; # Really big
+                               $stub = false;
+                               if ( $nt->isContentPage() ) {
+                                       $threshold = $wgUser->getOption('stubthreshold');
+                                       if ( $threshold > 0 ) {
+                                               $dbr = wfGetDB( DB_SLAVE );
+                                               $s = $dbr->selectRow(
+                                                       array( 'page' ),
+                                                       array( 'page_len',
+                                                              'page_is_redirect' ),
+                                                       array( 'page_id' => $aid ), $fname ) ;
+                                               $stub = ( $s !== false && !$s->page_is_redirect &&
+                                                         $s->page_len < $threshold );
                                        }
-                               } else {
-                                       $size = 1 ;
                                }
-                               if ( $size < $threshold ) {
+                               if ( $stub ) {
                                        $retVal = $this->makeStubLinkObj( $nt, $text, $query, $trail, $prefix );
                                } else {
                                        $retVal = $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix );
@@ -326,7 +331,9 @@ class Linker {
                $fname = 'Linker::makeBrokenLinkObj';
                wfProfileIn( $fname );
 
-               if ( '' == $query ) {
+               if( $nt->getNamespace() == NS_SPECIAL ) {
+                       $q = $query;
+               } else if ( '' == $query ) {
                        $q = 'action=edit';
                } else {
                        $q = 'action=edit&'.$query;
@@ -356,16 +363,8 @@ class Linker {
         *                      the end of the link.
         */
        function makeStubLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
-               $u = $nt->escapeLocalURL( $query );
-
-               if ( '' == $text ) {
-                       $text = htmlspecialchars( $nt->getPrefixedText() );
-               }
                $style = $this->getInternalLinkAttributesObj( $nt, $text, 'stub' );
-
-               list( $inside, $trail ) = Linker::splitTrail( $trail );
-               $s = "<a href=\"{$u}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
-               return $s;
+               return $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix, '', $style );
        }
 
        /**
@@ -428,26 +427,32 @@ class Linker {
                return $s;
        }
 
-       /** @todo document */
-       function makeImageLinkObj( $nt, $label, $alt, $align = '', $width = false, $height = false, $framed = false,
-         $thumb = false, $manual_thumb = '', $page = null, $valign = '' )
+       /** Creates the HTML source for images
+       * @param object $nt
+       * @param string $label label text
+       * @param string $alt alt text
+       * @param string $align horizontal alignment: none, left, center, right)
+       * @param array $params some format keywords: width, height, page, upright, upright_factor, frameless, border
+       * @param boolean $framed shows image in original size in a frame
+       * @param boolean $thumb shows image as thumbnail in a frame
+       * @param string $manual_thumb image name for the manual thumbnail
+       * @param string $valign vertical alignment: baseline, sub, super, top, text-top, middle, bottom, text-bottom
+       * @return string
+       */
+       function makeImageLinkObj( $nt, $label, $alt, $align = '', $params = array(), $framed = false,
+         $thumb = false, $manual_thumb = '', $valign = '', $time = false )
        {
-               global $wgContLang, $wgUser, $wgThumbLimits, $wgGenerateThumbnailOnParse;
+               global $wgContLang, $wgUser, $wgThumbLimits, $wgThumbUpright;
 
-               $img   = new Image( $nt );
+               $img = wfFindFile( $nt, $time );
 
-               if ( ! is_null( $page ) ) {
-                       $img->selectPage( $page );
-               }
-
-               if ( !$img->allowInlineDisplay() && $img->exists() ) {
+               if ( $img && !$img->allowInlineDisplay() ) {
+                       wfDebug( __METHOD__.': '.$nt->getPrefixedDBkey()." does not allow inline display\n" );
                        return $this->makeKnownLinkObj( $nt );
                }
 
-               $url   = $img->getViewURL();
                $error = $prefix = $postfix = '';
-
-               wfDebug( "makeImageLinkObj: '$width'x'$height', \"$label\"\n" );
+               $page = isset( $params['page'] ) ? $params['page'] : false;
 
                if ( 'center' == $align )
                {
@@ -455,6 +460,24 @@ class Linker {
                        $postfix = '</div>';
                        $align   = 'none';
                }
+               if ( $img && !isset( $params['width'] ) ) {
+                       $params['width'] = $img->getWidth( $page );
+                       if( $thumb || $framed || isset( $params['frameless'] ) ) {
+                               $wopt = $wgUser->getOption( 'thumbsize' );
+
+                               if( !isset( $wgThumbLimits[$wopt] ) ) {
+                                        $wopt = User::getDefaultOption( 'thumbsize' );
+                               }
+
+                               // Reduce width for upright images when parameter 'upright' is used
+                               if ( !isset( $params['upright_factor'] ) || $params['upright_factor'] == 0 ) {
+                                       $params['upright_factor'] = $wgThumbUpright;
+                               }
+                               // Use width which is smaller: real image width or user preference width
+                               // For caching health: If width scaled down due to upright parameter, round to full __0 pixel to avoid the creation of a lot of odd thumbs
+                               $params['width'] = min( $params['width'], isset( $params['upright'] ) ? round( $wgThumbLimits[$wopt] * $params['upright_factor'], -1 ) : $wgThumbLimits[$wopt] );
+                       }
+               }
 
                if ( $thumb || $framed ) {
 
@@ -468,73 +491,43 @@ class Linker {
                        if ( $align == '' ) {
                                $align = $wgContLang->isRTL() ? 'left' : 'right';
                        }
-
-
-                       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, $label, $alt, $align, $width, $height, $framed, $manual_thumb ).$postfix;
+                       return $prefix.$this->makeThumbLinkObj( $nt, $img, $label, $alt, $align, $params, $framed, $manual_thumb ).$postfix;
                }
 
-               if ( $width && $img->exists() ) {
-
-                       # Create a resized image, without the additional thumbnail
-                       # features
-
-                       if ( $height == false )
-                               $height = -1;
-                       if ( $manual_thumb == '') {
-                               $thumb = $img->getThumbnail( $width, $height, $wgGenerateThumbnailOnParse );
-                               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() );
-                                       // Do client-side scaling...
-                                       $height = intval( $img->getHeight() * $width / $img->getWidth() );
-                               }
-                       }
+               if ( $img && $params['width'] ) {
+                       # Create a resized image, without the additional thumbnail features
+                       $thumb = $img->transform( $params );
                } else {
-                       $width = $img->width;
-                       $height = $img->height;
+                       $thumb = false;
                }
 
-               wfDebug( "makeImageLinkObj2: '$width'x'$height'\n" );
-               $u = $nt->escapeLocalURL();
-               if ( $error ) {
-                       $s = $error;
-               } elseif ( $url == '' ) {
-                       $s = $this->makeBrokenImageLinkObj( $img->getTitle() );
-                       //$s .= "<br />{$alt}<br />{$url}<br />\n";
+               if ( $page ) {
+                       $query = 'page=' . urlencode( $page );
                } else {
-                       $s = '<a href="'.$u.'" class="image" title="'.$alt.'">' .
-                                '<img src="'.$url.'" alt="'.$alt.'" ' .
-                                ( $width
-                                       ? ( 'width="'.$width.'" height="'.$height.'" ' )
-                                       : '' ) .
-                                ( $valign
-                                       ? ( 'style="vertical-align: '.$valign.'" ' )
-                                       : '' ) .
-                                'longdesc="'.$u.'" /></a>';
+                       $query = '';
+               }
+               $u = $nt->getLocalURL( $query );
+               $imgAttribs = array(
+                       'alt' => $alt,
+                       'longdesc' => $u
+               );
+
+               if ( $valign ) {
+                       $imgAttribs['style'] = "vertical-align: $valign";
+               }
+               if ( isset( $params['border'] ) ) {
+                       $imgAttribs['class'] = "thumbborder";
+               }
+               $linkAttribs = array(
+                       'href' => $u,
+                       'class' => 'image',
+                       'title' => $alt
+               );
+
+               if ( !$thumb ) {
+                       $s = $this->makeBrokenImageLinkObj( $nt );
+               } else {
+                       $s = $thumb->toHtml( $imgAttribs, $linkAttribs );
                }
                if ( '' != $align ) {
                        $s = "<div class=\"float{$align}\"><span>{$s}</span></div>";
@@ -544,88 +537,82 @@ class Linker {
 
        /**
         * Make HTML for a thumbnail including image, border and caption
-        * $img is an Image object
+        * @param Title $nt 
+        * @param Image $img Image object or false if it doesn't exist
         */
-       function makeThumbLinkObj( $img, $label = '', $alt, $align = 'right', $boxwidth = 180, $boxheight=false, $framed=false , $manual_thumb = "" ) {
-               global $wgStylePath, $wgContLang, $wgGenerateThumbnailOnParse;
-               $thumbUrl = '';
-               $error = '';
-
-               $width = $height = 0;
-               if ( $img->exists() ) {
-                       $width  = $img->getWidth();
-                       $height = $img->getHeight();
-               }
-               if ( 0 == $width || 0 == $height ) {
-                       $width = $height = 180;
-               }
-               if ( $boxwidth == 0 ) {
-                       $boxwidth = 180;
+       function makeThumbLinkObj( Title $nt, $img, $label = '', $alt, $align = 'right', $params = array(), $framed=false , $manual_thumb = "" ) {
+               global $wgStylePath, $wgContLang;
+               $exists = $img && $img->exists();
+
+               $page = isset( $params['page'] ) ? $params['page'] : false;
+
+               if ( empty( $params['width'] ) ) {
+                       // Reduce width for upright images when parameter 'upright' is used 
+                       $params['width'] = isset( $params['upright'] ) ? 130 : 180;
                }
-               if ( $framed ) {
-                       // Use image dimensions, don't scale
-                       $boxwidth  = $width;
-                       $boxheight = $height;
-                       $thumbUrl  = $img->getViewURL();
+               $thumb = false;
+
+               if ( !$exists ) {
+                       $outerWidth = $params['width'] + 2;
                } else {
-                       if ( $boxheight === false )
-                               $boxheight = -1;
-                       if ( '' == $manual_thumb ) {
-                               $thumb = $img->getThumbnail( $boxwidth, $boxheight, $wgGenerateThumbnailOnParse );
-                               if ( $thumb ) {
-                                       $thumbUrl = $thumb->getUrl();
-                                       $boxwidth = $thumb->width;
-                                       $boxheight = $thumb->height;
-                               } else {
-                                       $error = $img->getLastError();
+                       if ( $manual_thumb != '' ) {
+                               # Use manually specified thumbnail
+                               $manual_title = Title::makeTitleSafe( NS_IMAGE, $manual_thumb );
+                               if( $manual_title ) {
+                                       $manual_img = wfFindFile( $manual_title );
+                                       if ( $manual_img ) {
+                                               $thumb = $manual_img->getUnscaledThumb();
+                                       } else {
+                                               $exists = false;
+                                       }
+                               }
+                       } elseif ( $framed ) {
+                               // Use image dimensions, don't scale
+                               $thumb = $img->getUnscaledThumb( $page );
+                       } else {
+                               # Do not present an image bigger than the source, for bitmap-style images
+                               # This is a hack to maintain compatibility with arbitrary pre-1.10 behaviour
+                               $srcWidth = $img->getWidth( $page );
+                               if ( $srcWidth && !$img->mustRender() && $params['width'] > $srcWidth ) {
+                                       $params['width'] = $srcWidth;
                                }
+                               $thumb = $img->transform( $params );
                        }
-               }
-               $oboxwidth = $boxwidth + 2;
 
-               if ( $manual_thumb != '' ) # Use manually specified thumbnail
-               {
-                       $manual_title = Title::makeTitleSafe( NS_IMAGE, $manual_thumb ); #new Title ( $manual_thumb ) ;
-                       if( $manual_title ) {
-                               $manual_img = new Image( $manual_title );
-                               $thumbUrl = $manual_img->getViewURL();
-                               if ( $manual_img->exists() )
-                               {
-                                       $width  = $manual_img->getWidth();
-                                       $height = $manual_img->getHeight();
-                                       $boxwidth = $width ;
-                                       $boxheight = $height ;
-                                       $oboxwidth = $boxwidth + 2 ;
-                               }
+                       if ( $thumb ) {
+                               $outerWidth = $thumb->getWidth() + 2;
+                       } else {
+                               $outerWidth = $params['width'] + 2;
                        }
                }
 
-               $u = $img->getEscapeLocalURL();
+               $query = $page ? 'page=' . urlencode( $page ) : '';
+               $u = $nt->getLocalURL( $query );
 
                $more = htmlspecialchars( wfMsg( 'thumbnail-more' ) );
                $magnifyalign = $wgContLang->isRTL() ? 'left' : 'right';
                $textalign = $wgContLang->isRTL() ? ' style="text-align:right"' : '';
 
-               $s = "<div class=\"thumb t{$align}\"><div class=\"thumbinner\" style=\"width:{$oboxwidth}px;\">";
-               if( $thumbUrl == '' ) {
-                       // Couldn't generate thumbnail? Scale the image client-side.
-                       $thumbUrl = $img->getViewURL();
-                       if( $boxheight == -1 ) {
-                               // Approximate...
-                               $boxheight = intval( $height * $boxwidth / $width );
-                       }
-               }
-               if ( $error ) {
-                       $s .= htmlspecialchars( $error );
+               $s = "<div class=\"thumb t{$align}\"><div class=\"thumbinner\" style=\"width:{$outerWidth}px;\">";
+               if( !$exists ) {
+                       $s .= $this->makeBrokenImageLinkObj( $nt );
                        $zoomicon = '';
-               } elseif( !$img->exists() ) {
-                       $s .= $this->makeBrokenImageLinkObj( $img->getTitle() );
+               } elseif ( !$thumb ) {
+                       $s .= htmlspecialchars( wfMsg( 'thumbnail_error', '' ) );
                        $zoomicon = '';
                } else {
-                       $s .= '<a href="'.$u.'" class="internal" title="'.$alt.'">'.
-                               '<img src="'.$thumbUrl.'" alt="'.$alt.'" ' .
-                               'width="'.$boxwidth.'" height="'.$boxheight.'" ' .
-                               'longdesc="'.$u.'" class="thumbimage" /></a>';
+                       $imgAttribs = array(
+                               'alt' => $alt,
+                               'longdesc' => $u,
+                               'class' => 'thumbimage'
+                       );
+                       $linkAttribs = array(
+                               'href' => $u,
+                               'class' => 'internal',
+                               'title' => $alt
+                       );
+                               
+                       $s .= $thumb->toHtml( $imgAttribs, $linkAttribs );
                        if ( $framed ) {
                                $zoomicon="";
                        } else {
@@ -640,40 +627,44 @@ class Linker {
        }
 
        /**
-        * Pass a title object, not a title string
+        * Make a "broken" link to an image
+        *
+        * @param Title $title Image title
+        * @param string $text Link label
+        * @param string $query Query string
+        * @param string $trail Link trail
+        * @param string $prefix Link prefix
+        * @return string
         */
-       function makeBrokenImageLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
-               # Fail gracefully
-               if ( ! isset($nt) ) {
-                       # throw new MWException();
+       public function makeBrokenImageLinkObj( $title, $text = '', $query = '', $trail = '', $prefix = '' ) {
+               global $wgEnableUploads;
+               if( $title instanceof Title ) {
+                       wfProfileIn( __METHOD__ );
+                       if( $wgEnableUploads ) {
+                               $upload = SpecialPage::getTitleFor( 'Upload' );
+                               if( $text == '' )
+                                       $text = htmlspecialchars( $title->getPrefixedText() );
+                               $q = 'wpDestFile=' . $title->getPartialUrl();
+                               if( $query != '' )
+                                       $q .= '&' . $query;
+                               list( $inside, $trail ) = self::splitTrail( $trail );
+                               $style = $this->getInternalLinkAttributesObj( $title, $text, 'yes' );
+                               wfProfileOut( __METHOD__ );
+                               return '<a href="' . $upload->escapeLocalUrl( $q ) . '"'
+                                       . $style . '>' . $prefix . $text . $inside . '</a>' . $trail;
+                       } else {
+                               wfProfileOut( __METHOD__ );
+                               return $this->makeKnownLinkObj( $title, $text, $query, $trail, $prefix );
+                       }
+               } else {
                        return "<!-- ERROR -->{$prefix}{$text}{$trail}";
                }
-
-               $fname = 'Linker::makeBrokenImageLinkObj';
-               wfProfileIn( $fname );
-
-               $q = 'wpDestFile=' . urlencode( $nt->getDBkey() );
-               if ( '' != $query ) {
-                       $q .= "&$query";
-               }
-               $uploadTitle = SpecialPage::getTitleFor( '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, /* wtf?! */ $url, $alt = '' ) {
+       /** @deprecated use Linker::makeMediaLinkObj() */
+       function makeMediaLink( $name, $unused = '', $text = '' ) {
                $nt = Title::makeTitleSafe( NS_IMAGE, $name );
-               return $this->makeMediaLinkObj( $nt, $alt );
+               return $this->makeMediaLinkObj( $nt, $text );
        }
 
        /**
@@ -681,8 +672,6 @@ class Linker {
         *
         * @param $title Title object.
         * @param $text  String: pre-sanitized HTML
-        * @param $nourl Boolean: Mask absolute URLs, so the parser doesn't
-        *                       linkify them (it is currently not context-aware)
         * @return string HTML
         *
         * @public
@@ -693,13 +682,13 @@ class Linker {
                        ### HOTFIX. Instead of breaking, return empty string.
                        return $text;
                } else {
-                       $img  = new Image( $title );
-                       if( $img->exists() ) {
+                       $img  = wfFindFile( $title );
+                       if( $img ) {
                                $url  = $img->getURL();
                                $class = 'internal';
                        } else {
                                $upload = SpecialPage::getTitleFor( 'Upload' );
-                               $url = $upload->getLocalUrl( 'wpDestFile=' . urlencode( $img->getName() ) );
+                               $url = $upload->getLocalUrl( 'wpDestFile=' . urlencode( $title->getDbKey() ) );
                                $class = 'new';
                        }
                        $alt = htmlspecialchars( $title->getText() );
@@ -772,7 +761,7 @@ class Linker {
                if( $userId ) {
                        // check if the user has an edit
                        if( $redContribsWhenNoEdits && User::edits( $userId ) == 0 ) {
-                               $style = "class='new'";
+                               $style = " class='new'";
                        } else {
                                $style = '';
                        }
@@ -806,11 +795,8 @@ class Linker {
         * @private
         */
        function userTalkLink( $userId, $userText ) {
-               global $wgLang;
-               $talkname = $wgLang->getNsText( NS_TALK ); # use the shorter name
-
                $userTalkPage = Title::makeTitle( NS_USER_TALK, $userText );
-               $userTalkLink = $this->makeLinkObj( $userTalkPage, $talkname );
+               $userTalkLink = $this->makeLinkObj( $userTalkPage, wfMsgHtml( 'talkpagelinktext' ) );
                return $userTalkLink;
        }
 
@@ -875,23 +861,40 @@ class Linker {
         * Since you can't set a default parameter for a reference, I've turned it
         * temporarily to a value pass. Should be adjusted further. --brion
         *
-        * $param string $comment
+        * @param string $comment
         * @param mixed $title Title object (to generate link to the section in autocomment) or null
         * @param bool $local Whether section links should refer to local page
         */
        function formatComment($comment, $title = NULL, $local = false) {
                wfProfileIn( __METHOD__ );
 
-               global $wgContLang;
+               # Sanitize text a bit:
                $comment = str_replace( "\n", " ", $comment );
                $comment = htmlspecialchars( $comment );
 
-               # The pattern for autogen comments is / * foo * /, which makes for
-               # some nasty regex.
-               # We look for all comments, match any text before and after the comment,
-               # add a separator where needed and format the comment itself with CSS
+               # Render autocomments and make links:
+               $comment = $this->formatAutoComments( $comment, $title, $local );
+               $comment = $this->formatLinksInComment( $comment );
+
+               wfProfileOut( __METHOD__ );
+               return $comment;
+       }
+
+       /**
+        * The pattern for autogen comments is / * foo * /, which makes for
+        * some nasty regex.
+        * We look for all comments, match any text before and after the comment,
+        * add a separator where needed and format the comment itself with CSS
+        * Called by Linker::formatComment.
+        *
+        * @param $comment Comment text
+        * @param $title An optional title object used to links to sections
+        *
+        * @todo Document the $local parameter.
+        */
+       private function formatAutocomments( $comment, $title = NULL, $local = false ) {
                $match = array();
-               while (preg_match('/(.*)\/\*\s*(.*?)\s*\*\/(.*)/', $comment,$match)) {
+               while (preg_match('!(.*)/\*\s*(.*?)\s*\*/(.*)!', $comment,$match)) {
                        $pre=$match[1];
                        $auto=$match[2];
                        $post=$match[3];
@@ -923,10 +926,22 @@ class Linker {
                        $comment=$pre.$auto.$post;
                }
 
-               # format regular and media links - all other wiki formatting
-               # is ignored
+               return $comment;
+       }
+
+       /**
+        * Formats wiki links and media links in text; all other wiki formatting
+        * is ignored
+        *
+        * @param string $comment Text to format links in
+        * @return string
+        */
+       public function formatLinksInComment( $comment ) {
+               global $wgContLang;
+
                $medians = '(?:' . preg_quote( Namespace::getCanonicalName( NS_MEDIA ), '/' ) . '|';
                $medians .= preg_quote( $wgContLang->getNsText( NS_MEDIA ), '/' ) . '):';
+
                while(preg_match('/\[\[:?(.*?)(\|(.*?))*\]\](.*)$/',$comment,$match)) {
                        # Handle link renaming [[foo|text]] will show link as "text"
                        if( "" != $match[3] ) {
@@ -953,7 +968,7 @@ class Linker {
                        }
                        $comment = preg_replace( $linkRegexp, StringUtils::escapeRegexReplacement( $thelink ), $comment, 1 );
                }
-               wfProfileOut( __METHOD__ );
+
                return $comment;
        }
 
@@ -978,7 +993,7 @@ class Linker {
                        return " <span class=\"comment\">($formatted)</span>";
                }
        }
-       
+
        /**
         * Wrap and format the given revision's comment block, if the current
         * user is allowed to view it.
@@ -1028,7 +1043,7 @@ class Linker {
        /** @todo document */
        function tocList($toc) {
                global $wgJsMimeType;
-               $title =  wfMsgForContent('toc') ;
+               $title =  wfMsgHtml('toc') ;
                return
                   '<table id="toc" class="toc" summary="' . $title .'"><tr><td>'
                 . '<div id="toctitle"><h2>' . $title . "</h2></div>\n"
@@ -1038,38 +1053,73 @@ class Linker {
                 . "</ul>\n</td></tr></table>"
                 . '<script type="' . $wgJsMimeType . '">'
                 . ' if (window.showTocToggle) {'
-                . ' var tocShowText = "' . wfEscapeJsString( wfMsgForContent('showtoc') ) . '";'
-                . ' var tocHideText = "' . wfEscapeJsString( wfMsgForContent('hidetoc') ) . '";'
+                . ' var tocShowText = "' . wfEscapeJsString( wfMsg('showtoc') ) . '";'
+                . ' var tocHideText = "' . wfEscapeJsString( wfMsg('hidetoc') ) . '";'
                 . ' showTocToggle();'
                 . ' } '
                 . "</script>\n";
        }
 
-       /** @todo document */
+       /**
+        * Used to generate section edit links that point to "other" pages
+        * (sections that are really part of included pages).
+        *
+        * @param $title Title string.
+        * @param $section Integer: section number.
+        */
        public function editSectionLinkForOther( $title, $section ) {
-               global $wgContLang;
-
                $title = Title::newFromText( $title );
-               $editurl = '&section='.$section;
-               $url = $this->makeKnownLinkObj( $title, wfMsg('editsection'), 'action=edit'.$editurl );
-
-               return "<span class=\"editsection\">[".$url."]</span>";
-
+               return $this->doEditSectionLink( $title, $section, '', 'EditSectionLinkForOther' );
        }
 
        /**
-        * @param $title Title object.
+        * @param $nt Title object.
         * @param $section Integer: section number.
         * @param $hint Link String: title, or default if omitted or empty
         */
-       public function editSectionLink( $nt, $section, $hint='' ) {
-               global $wgContLang;
+       public function editSectionLink( Title $nt, $section, $hint='' ) {
+               if( $hint != '' ) {
+                       $hint = wfMsgHtml( 'editsectionhint', htmlspecialchars( $hint ) );
+                       $hint = " title=\"$hint\"";
+               }
+               return $this->doEditSectionLink( $nt, $section, $hint, 'EditSectionLink' );
+       }
 
+       /**
+        * Implement editSectionLink and editSectionLinkForOther.
+        *
+        * @param $nt      Title object
+        * @param $section Integer, section number
+        * @param $hint    String, for HTML title attribute
+        * @param $hook    String, name of hook to run
+        * @return         String, HTML to use for edit link
+        */
+       protected function doEditSectionLink( Title $nt, $section, $hint, $hook ) {
+               global $wgContLang;
                $editurl = '&section='.$section;
-               $hint = ( $hint=='' ) ? '' : ' title="' . wfMsgHtml( 'editsectionhint', htmlspecialchars( $hint ) ) . '"';
-               $url = $this->makeKnownLinkObj( $nt, wfMsg('editsection'), 'action=edit'.$editurl, '', '', '',  $hint );
-
-               return "<span class=\"editsection\">[".$url."]</span>";
+               $url = $this->makeKnownLinkObj(
+                       $nt,
+                       wfMsg('editsection'),
+                       'action=edit'.$editurl,
+                       '', '', '',  $hint
+               );
+               $result = null;
+
+               // The two hooks have slightly different interfaces . . .
+               if( $hook == 'EditSectionLink' ) {
+                       wfRunHooks( $hook, array( &$this, $nt, $section, $hint, $url, &$result ) );
+               } elseif( $hook == 'EditSectionLinkForOther' ) {
+                       wfRunHooks( $hook, array( &$this, $nt, $section, $url, &$result ) );
+               }
+               
+               // For reverse compatibility, add the brackets *after* the hook is run,
+               // and even add them to hook-provided text.
+               if( is_null( $result ) ) {
+                       $result = wfMsg( 'editsection-brackets', $url );
+               } else {
+                       $result = wfMsg( 'editsection-brackets', $result );
+               }
+               return "<span class=\"editsection\">$result</span>";
        }
 
        /**
@@ -1125,15 +1175,28 @@ class Linker {
         * @param Revision $rev
         */
        function generateRollback( $rev ) {
-               global $wgUser, $wgRequest;
+               return '<span class="mw-rollback-link">['
+                       . $this->buildRollbackLink( $rev )
+                       . ']</span>';
+       }
+       
+       /**
+        * Build a raw rollback link, useful for collections of "tool" links
+        *
+        * @param Revision $rev
+        * @return string
+        */
+       public function buildRollbackLink( $rev ) {
+               global $wgRequest, $wgUser;
                $title = $rev->getTitle();
-
-               $extraRollback = $wgRequest->getBool( 'bot' ) ? '&bot=1' : '';
-               $extraRollback .= '&token=' . urlencode(
-                       $wgUser->editToken( array( $title->getPrefixedText(), $rev->getUserText() ) ) );
-               return '<span class="mw-rollback-link">['. $this->makeKnownLinkObj( $title,
-                       wfMsg('rollbacklink'),
-                       'action=rollback&from=' . urlencode( $rev->getUserText() ) . $extraRollback ) .']</span>';
+               $extra  = $wgRequest->getBool( 'bot' ) ? '&bot=1' : '';
+               $extra .= '&token=' . urlencode( $wgUser->editToken( array( $title->getPrefixedText(),
+                       $rev->getUserText() ) ) );
+               return $this->makeKnownLinkObj(
+                       $title,
+                       wfMsgHtml( 'rollbacklink' ),
+                       'action=rollback&from=' . urlencode( $rev->getUserText() ) . $extra
+               );              
        }
 
        /**
@@ -1272,4 +1335,5 @@ class Linker {
        }
 }
 
-?>
+
+