/** @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'";
+ $r = ($class != '') ? " class=\"$class\"" : " class=\"external\"";
$r .= " title=\"{$link}\"";
return $r;
}
/**
- * @param bool $broken
+ * @param $nt Title object.
+ * @param $text String: FIXME
+ * @param $broken Boolean: FIXME, default 'false'.
*/
function getInternalLinkAttributesObj( &$nt, $text, $broken = false ) {
if( $broken == 'stub' ) {
}
/**
- * 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 $title String: the text of the title
+ * @param $text String: link text
+ * @param $query String: optional query part
+ * @param $trail String: 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( '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 $title String: the text of the title
+ * @param $text String: link text
+ * @param $query String: optional query part
+ * @param $trail String: 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) {
}
}
- /** @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) {
}
}
- /** @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 $title String: the text of the title
+ * @param $text String: link text
+ * @param $query String: optional query part
+ * @param $trail String: 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) {
}
/**
- * 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 $title String: the text of the title
+ * @param $text String: link text
+ * @param $query String: optional query part
+ * @param $trail String: 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 $wgUser;
# Fail gracefully
if ( ! is_object($nt) ) {
- # wfDebugDieBacktrace();
+ # throw new MWException();
wfProfileOut( $fname );
return "<!-- ERROR -->{$prefix}{$text}{$trail}";
}
$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 ) {
}
$t = "<a href=\"{$u}\"{$style}>{$text}{$inside}</a>";
-
+
wfProfileOut( $fname );
return $t;
} elseif ( $nt->isAlwaysKnown() ) {
}
/**
- * Pass a title object, not a title string
- * @param object Title of target page
- * @param string Text to replace the title
- * @param string Link target
- * @param string Text after link
- * @param string Text before link text
- * @param string Extra attributes to the a-element
+ * 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 $nt Title object of target page
+ * @param $text String: text to replace the title
+ * @param $query String: link target
+ * @param $trail String: text after link
+ * @param $prefix String: text before link text
+ * @param $aprops String: extra attributes to the a-element
+ * @param $style String: style to apply - if empty, use getInternalLinkAttributesObj instead
* @return the a-element
*/
- function makeKnownLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '' ) {
+ function makeKnownLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '', $style = '' ) {
$fname = 'Linker::makeKnownLinkObj';
wfProfileIn( $fname );
wfProfileOut( $fname );
return $text;
}
-
+
$u = $nt->escapeLocalURL( $query );
- if ( '' != $nt->getFragment() ) {
+ if ( $nt->getFragment() != '' ) {
if( $nt->getPrefixedDbkey() == '' ) {
$u = '';
if ( '' == $text ) {
);
$u .= '#' . str_replace(array_keys($replacearray),array_values($replacearray),$anchor);
}
- if ( '' == $text ) {
+ if ( $text == '' ) {
$text = htmlspecialchars( $nt->getPrefixedText() );
}
- $style = $this->getInternalLinkAttributesObj( $nt, $text );
+ 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 );
}
/**
- * Pass a title object, not a title string
+ * Make a red link to the edit page of a given title.
+ *
+ * @param $title String: The text of the title
+ * @param $text String: Link text
+ * @param $query String: Optional query part
+ * @param $trail String: 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 = '' ) {
# Fail gracefully
if ( ! isset($nt) ) {
- # wfDebugDieBacktrace();
+ # throw new MWException();
return "<!-- ERROR -->{$prefix}{$text}{$trail}";
}
$text = htmlspecialchars( $nt->getPrefixedText() );
}
$style = $this->getInternalLinkAttributesObj( $nt, $text, "yes" );
-
+
list( $inside, $trail ) = Linker::splitTrail( $trail );
$s = "<a href=\"{$u}\"{$style}>{$prefix}{$text}{$inside}</a>{$trail}";
}
/**
- * Pass a title object, not a title string
+ * Make a brown link to a short article.
+ *
+ * @param $title String: the text of the title
+ * @param $text String: link text
+ * @param $query String: optional query part
+ * @param $trail String: 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 = '' ) {
$link = $nt->getPrefixedURL();
* 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
+ * @param $size Integer
+ * @param $nt Title object.
+ * @param $text String
+ * @param $query String
+ * @param $trail String
+ * @param $prefix String
* @return string HTML of link
*/
function makeSizeLinkObj( $size, $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
}
}
- /** @todo document */
+ /**
+ * 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 = '' ) {
- $u = $nt->escapeLocalURL( $query );
if ( '' == $text ) {
$text = htmlspecialchars( $nt->getPrefixedText() );
}
list( $inside, $trail ) = Linker::splitTrail( $trail );
- return "<strong>{$prefix}{$text}{$inside}</strong>{$trail}";
+ return "<strong class=\"selflink\">{$prefix}{$text}{$inside}</strong>{$trail}";
}
/** @todo document */
/** @todo document */
function makeImageLinkObj( $nt, $label, $alt, $align = '', $width = false, $height = false, $framed = false,
- $thumb = false, $manual_thumb = '' )
+ $thumb = false, $manual_thumb = '', $page = null )
{
- global $wgContLang, $wgUser, $wgThumbLimits;
-
+ global $wgContLang, $wgUser, $wgThumbLimits, $wgGenerateThumbnailOnParse;
+
$img = new Image( $nt );
- if ( !$img->allowInlineDisplay() ) {
+
+ if ( ! is_null( $page ) ) {
+ $img->selectPage( $page );
+ }
+
+ if ( !$img->allowInlineDisplay() && $img->exists() ) {
return $this->makeKnownLinkObj( $nt );
}
$url = $img->getViewURL();
- $prefix = $postfix = '';
-
- wfDebug( "makeImageLinkObj: '$width'x'$height'\n" );
-
+ $error = $prefix = $postfix = '';
+
+ wfDebug( "makeImageLinkObj: '$width'x'$height', \"$label\"\n" );
+
if ( 'center' == $align )
{
$prefix = '<div class="center">';
$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;
}
if ( $height == false )
$height = -1;
if ( $manual_thumb == '') {
- $thumb = $img->getThumbnail( $width, $height );
+ $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,
wfDebug( "makeImageLinkObj: client-size set to '$width x $height'\n" );
$url = $thumb->getUrl();
+ } else {
+ $error = htmlspecialchars( $img->getLastError() );
}
}
} else {
wfDebug( "makeImageLinkObj2: '$width'x'$height'\n" );
$u = $nt->escapeLocalURL();
- if ( $url == '' ) {
+ if ( $error ) {
+ $s = $error;
+ } elseif ( $url == '' ) {
$s = $this->makeBrokenImageLinkObj( $img->getTitle() );
//$s .= "<br />{$alt}<br />{$url}<br />\n";
} else {
* $img is an Image object
*/
function makeThumbLinkObj( $img, $label = '', $alt, $align = 'right', $boxwidth = 180, $boxheight=false, $framed=false , $manual_thumb = "" ) {
- global $wgStylePath, $wgContLang;
- $url = $img->getViewURL();
+ global $wgStylePath, $wgContLang, $wgGenerateThumbnailOnParse;
$thumbUrl = '';
+ $error = '';
$width = $height = 0;
if ( $img->exists() ) {
$height = $img->getHeight();
}
if ( 0 == $width || 0 == $height ) {
- $width = $height = 200;
+ $width = $height = 180;
}
if ( $boxwidth == 0 ) {
- $boxwidth = 200;
+ $boxwidth = 180;
}
if ( $framed ) {
// Use image dimensions, don't scale
$boxwidth = $width;
$boxheight = $height;
- $thumbUrl = $url;
+ $thumbUrl = $img->getViewURL();
} else {
if ( $boxheight === false )
$boxheight = -1;
if ( '' == $manual_thumb ) {
- $thumb = $img->getThumbnail( $boxwidth, $boxheight );
+ $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 ); #new Title ( $manual_thumb ) ;
- $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( $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 ;
+ }
}
}
$s = "<div class=\"thumb t{$align}\"><div style=\"width:{$oboxwidth}px;\">";
if( $thumbUrl == '' ) {
// Couldn't generate thumbnail? Scale the image client-side.
- $thumbUrl = $url;
+ $thumbUrl = $img->getViewURL();
}
- if( !$img->exists() ) {
+ if ( $error ) {
+ $s .= htmlspecialchars( $error );
+ $zoomicon = '';
+ } elseif( !$img->exists() ) {
$s .= $this->makeBrokenImageLinkObj( $img->getTitle() );
$zoomicon = '';
} else {
'width="15" height="11" alt="'.$more.'" /></a></div>';
}
}
- $s .= ' <div class="thumbcaption" '.$textalign.'>'.$zoomicon.$label."</div></div></div>";
+ $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();
+ # throw new MWException();
return "<!-- ERROR -->{$prefix}{$text}{$trail}";
}
wfProfileOut( $fname );
return $s;
}
-
+
/** @todo document */
function makeMediaLink( $name, /* wtf?! */ $url, $alt = '' ) {
$nt = Title::makeTitleSafe( NS_IMAGE, $name );
/**
* 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
+ * @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
*
- * @access public
+ * @public
* @todo Handle invalid or missing images better.
*/
function makeMediaLinkObj( $title, $text = '' ) {
### HOTFIX. Instead of breaking, return empty string.
return $text;
} else {
- $name = $title->getDBKey();
+ $name = $title->getDBKey();
$img = new Image( $title );
if( $img->exists() ) {
$url = $img->getURL();
$text = $alt;
}
$u = htmlspecialchars( $url );
- return "<a href=\"{$u}\" class='$class' title=\"{$alt}\">{$text}</a>";
+ return "<a href=\"{$u}\" class=\"$class\" title=\"{$alt}\">{$text}</a>";
}
}
}
/** @todo document */
- function makeExternalLink( $url, $text, $escape = true, $linktype = '' ) {
+ function makeExternalLink( $url, $text, $escape = true, $linktype = '', $ns = null ) {
$style = $this->getExternalLinkAttributes( $url, $text, 'external ' . $linktype );
- global $wgNoFollowLinks;
- if( $wgNoFollowLinks ) {
+ global $wgNoFollowLinks, $wgNoFollowNsExceptions;
+ if( $wgNoFollowLinks && !(isset($ns) && in_array($ns, $wgNoFollowNsExceptions)) ) {
$style .= ' rel="nofollow"';
}
$url = htmlspecialchars( $url );
return '<a href="'.$url.'"'.$style.'>'.$text.'</a>';
}
+ /**
+ * Make user link (or user contributions for unregistered users)
+ * @param $userId Integer: user id in database.
+ * @param $userText String: user name in database
+ * @return string HTML fragment
+ * @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 $userId Integer: user id in database.
+ * @param $userText String: user name in database.
+ * @return string HTML fragment with talk and/or block links
+ * @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 $userId Integer: user id in database.
+ * @param $userText String: user name in database.
+ * @return string HTML fragment with user talk link
+ * @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 );
+ return $userTalkLink;
+ }
+
+ /**
+ * @param $userId Integer: userid
+ * @param $userText String: user name in database.
+ * @return string HTML fragment with block link
+ * @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 $rev Revision object.
+ * @return string HTML
+ */
+ function revUserLink( $rev ) {
+ if( $rev->userCan( Revision::DELETED_USER ) ) {
+ $link = $this->userLink( $rev->getRawUser(), $rev->getRawUserText() );
+ } else {
+ $link = wfMsgHtml( 'rev-deleted-user' );
+ }
+ if( $rev->isDeleted( Revision::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 $rev Revision object.
+ * @return string HTML
+ */
+ function revUserTools( $rev ) {
+ if( $rev->userCan( Revision::DELETED_USER ) ) {
+ $link = $this->userLink( $rev->getRawUser(), $rev->getRawUserText() ) .
+ ' ' .
+ $this->userToolLinks( $rev->getRawUser(), $rev->getRawUserText() );
+ } else {
+ $link = wfMsgHtml( 'rev-deleted-user' );
+ }
+ if( $rev->isDeleted( Revision::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>
*
function formatComment($comment, $title = NULL) {
$fname = 'Linker::formatComment';
wfProfileIn( $fname );
-
+
global $wgContLang;
$comment = str_replace( "\n", " ", $comment );
$comment = htmlspecialchars( $comment );
$auto=$match[2];
$post=$match[3];
$link='';
- if($title) {
- $section=$auto;
-
- # This is hackish but should work in most cases.
- $section=str_replace('[[','',$section);
- $section=str_replace(']]','',$section);
- $title->mFragment=$section;
- $link=$this->makeKnownLinkObj($title,wfMsg('sectionlink'));
+ if( $title ) {
+ $section = $auto;
+
+ # Generate a valid anchor name from the section title.
+ # Hackish, but should generally work - we strip wiki
+ # syntax, including the magic [[: that is used to
+ # "link rather than show" in case of images and
+ # interlanguage links.
+ $section = str_replace( '[[:', '', $section );
+ $section = str_replace( '[[', '', $section );
+ $section = str_replace( ']]', '', $section );
+ $sectionTitle = wfClone( $title );
+ $sectionTitle->mFragment = $section;
+ $link = $this->makeKnownLinkObj( $sectionTitle, wfMsg( 'sectionlink' ) );
}
$sep='-';
$auto=$link.$auto;
$match[1] = substr($match[1], 1);
$thelink = $this->makeLink( $match[1], $text, "", $trail );
}
- # Quote backreferences, then run preg_replace
- $thelink = strtr( $thelink, array( "\\" => "\\\\", '$' => "\\$" ) );
- $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
- * @param bool $deleted
+ * @param $comment String: the comment.
+ * @param $title Title object.
*
* @return string
*/
- function commentBlock( $comment, $title = NULL, $deleted = false ) {
+ 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 {
- if ( $deleted )
- return " <span class='comment'>(...)</span>";
- else {
- $formatted = $this->formatComment( $comment, $title );
- return " <span class='comment'>($formatted)</span>";
- }
+ $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 $rev Revision object.
+ * @return string HTML
+ */
+ function revComment( $rev ) {
+ if( $rev->userCan( Revision::DELETED_COMMENT ) ) {
+ $block = $this->commentBlock( $rev->getRawComment(), $rev->getTitle() );
+ } else {
+ $block = " <span class=\"comment\">" .
+ wfMsgHtml( 'rev-deleted-comment' ) . "</span>";
}
+ if( $rev->isDeleted( Revision::DELETED_COMMENT ) ) {
+ return " <span class=\"history-deleted\">$block</span>";
+ }
+ return $block;
}
/** @todo document */
* parameter level defines if we are on an indentation level
*/
function tocLine( $anchor, $tocline, $tocnumber, $level ) {
- return "\n<li class=
'toclevel-$level'><a href=\"#" .
+ return "\n<li class=
\"toclevel-$level\"><a href=\"#" .
$anchor . '"><span class="tocnumber">' .
$tocnumber . '</span> <span class="toctext">' .
$tocline . '</span></a>';
'<table id="toc" class="toc" summary="' . $title .'"><tr><td>'
. '<div id="toctitle"><h2>' . $title . "</h2></div>\n"
. $toc
- . "</ul>\n</td></tr></table>\n"
+ # 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') ) . '";'
function editSectionLinkForOther( $title, $section ) {
global $wgContLang;
- $title = Title::newFromText($title);
+ $title = Title::newFromText( $title );
$editurl = '§ion='.$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';
}
- /** @todo document */
- function editSectionLink( $nt, $section ) {
+ /**
+ * @param $title Title object.
+ * @param $section Integer: section number.
+ * @param $hint Link String: title, or default if omitted or empty
+ */
+ function editSectionLink( $nt, $section, $hint='' ) {
global $wgContLang;
$editurl = '§ion='.$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';
*
* @static
*/
- function splitTrail( $trail ) {
+ static function splitTrail( $trail ) {
static $regex = false;
if ( $regex === false ) {
global $wgContLang;
dépôts / lhc / web / wiklou.git / blobdiff