';
+ if ( 'center' == $frameParams['align'] ) {
+ $prefix = '
';
$postfix = '
';
- $fp['align'] = 'none';
- }
- if ( $file && !isset( $hp['width'] ) ) {
- $hp['width'] = $file->getWidth( $page );
+ $frameParams['align'] = 'none';
+ }
+ if ( $file && !isset( $handlerParams['width'] ) ) {
+ if ( isset( $handlerParams['height'] ) && $file->isVectorized() ) {
+ // If its a vector image, and user only specifies height
+ // we don't want it to be limited by its "normal" width.
+ global $wgSVGMaxSize;
+ $handlerParams['width'] = $wgSVGMaxSize;
+ } else {
+ $handlerParams['width'] = $file->getWidth( $page );
+ }
- if ( isset( $fp['thumbnail'] ) || isset( $fp['framed'] ) || isset( $fp['frameless'] ) || !$hp['width'] ) {
+ if ( isset( $frameParams['thumbnail'] )
+ || isset( $frameParams['manualthumb'] )
+ || isset( $frameParams['framed'] )
+ || isset( $frameParams['frameless'] )
+ || !$handlerParams['width']
+ ) {
global $wgThumbLimits, $wgThumbUpright;
- if ( !isset( $widthOption ) || !isset( $wgThumbLimits[$widthOption] ) ) {
+
+ if ( $widthOption === null || !isset( $wgThumbLimits[$widthOption] ) ) {
$widthOption = User::getDefaultOption( 'thumbsize' );
}
// Reduce width for upright images when parameter 'upright' is used
- if ( isset( $fp['upright'] ) && $fp['upright'] == 0 ) {
- $fp['upright'] = $wgThumbUpright;
+ if ( isset( $frameParams['upright'] ) && $frameParams['upright'] == 0 ) {
+ $frameParams['upright'] = $wgThumbUpright;
}
- // 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
- $prefWidth = isset( $fp['upright'] ) ?
- round( $wgThumbLimits[$widthOption] * $fp['upright'], -1 ) :
+
+ // 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.
+ $prefWidth = isset( $frameParams['upright'] ) ?
+ round( $wgThumbLimits[$widthOption] * $frameParams['upright'], -1 ) :
$wgThumbLimits[$widthOption];
// Use width which is smaller: real image width or user preference width
// Unless image is scalable vector.
- if ( !isset( $hp['height'] ) && ( $hp['width'] <= 0 ||
- $prefWidth < $hp['width'] || $file->isVectorized() ) ) {
- $hp['width'] = $prefWidth;
+ if ( !isset( $handlerParams['height'] ) && ( $handlerParams['width'] <= 0 ||
+ $prefWidth < $handlerParams['width'] || $file->isVectorized() ) ) {
+ $handlerParams['width'] = $prefWidth;
}
}
}
- if ( isset( $fp['thumbnail'] ) || isset( $fp['manualthumb'] ) || isset( $fp['framed'] ) ) {
- global $wgContLang;
- # Create a thumbnail. Alignment depends on language
- # writing direction, # right aligned for left-to-right-
- # languages ("Western languages"), left-aligned
- # for right-to-left-languages ("Semitic languages")
- #
- # If thumbnail width has not been provided, it is set
+ if ( isset( $frameParams['thumbnail'] ) || isset( $frameParams['manualthumb'] )
+ || isset( $frameParams['framed'] )
+ ) {
+ # Create a thumbnail. Alignment depends on the writing direction of
+ # the page content language (right-aligned for LTR languages,
+ # left-aligned for RTL languages)
+ # If a thumbnail width has not been provided, it is set
# to the default user option as specified in Language*.php
- if ( $fp['align'] == '' ) {
- $fp['align'] = $wgContLang->alignEnd();
+ if ( $frameParams['align'] == '' ) {
+ $frameParams['align'] = $parser->getTargetLanguage()->alignEnd();
}
- return $prefix . $this->makeThumbLink2( $title, $file, $fp, $hp, $time, $query ) . $postfix;
+ return $prefix .
+ self::makeThumbLink2( $title, $file, $frameParams, $handlerParams, $time, $query ) .
+ $postfix;
}
- if ( $file && isset( $fp['frameless'] ) ) {
+ if ( $file && isset( $frameParams['frameless'] ) ) {
$srcWidth = $file->getWidth( $page );
- # For "frameless" option: do not present an image bigger than the source (for bitmap-style images)
- # This is the same behaviour as the "thumb" option does it already.
- if ( $srcWidth && !$file->mustRender() && $hp['width'] > $srcWidth ) {
- $hp['width'] = $srcWidth;
+ # For "frameless" option: do not present an image bigger than the
+ # source (for bitmap-style images). This is the same behavior as the
+ # "thumb" option does it already.
+ if ( $srcWidth && !$file->mustRender() && $handlerParams['width'] > $srcWidth ) {
+ $handlerParams['width'] = $srcWidth;
}
}
- if ( $file && isset( $hp['width'] ) ) {
+ if ( $file && isset( $handlerParams['width'] ) ) {
# Create a resized image, without the additional thumbnail features
- $thumb = $file->transform( $hp );
+ $thumb = $file->transform( $handlerParams );
} else {
$thumb = false;
}
if ( !$thumb ) {
- $s = $this->makeBrokenImageLinkObj( $title, $fp['title'], '', '', '', $time == true );
+ $s = self::makeBrokenImageLinkObj( $title, $frameParams['title'], '', '', '', $time == true );
} else {
- $params = array(
- 'alt' => $fp['alt'],
- 'title' => $fp['title'],
- 'valign' => isset( $fp['valign'] ) ? $fp['valign'] : false ,
- 'img-class' => isset( $fp['border'] ) ? 'thumbborder' : false );
- $params = $this->getImageLinkMTOParams( $fp, $query ) + $params;
+ self::processResponsiveImages( $file, $thumb, $handlerParams );
+ $params = [
+ 'alt' => $frameParams['alt'],
+ 'title' => $frameParams['title'],
+ 'valign' => isset( $frameParams['valign'] ) ? $frameParams['valign'] : false,
+ 'img-class' => $frameParams['class'] ];
+ if ( isset( $frameParams['border'] ) ) {
+ $params['img-class'] .= ( $params['img-class'] !== '' ? ' ' : '' ) . 'thumbborder';
+ }
+ $params = self::getImageLinkMTOParams( $frameParams, $query, $parser ) + $params;
$s = $thumb->toHtml( $params );
}
- if ( $fp['align'] != '' ) {
- $s = "
{$s}
";
+ if ( $frameParams['align'] != '' ) {
+ $s = "
{$s}
";
}
return str_replace( "\n", ' ', $prefix . $s . $postfix );
}
@@ -546,18 +460,29 @@ class Linker {
/**
* Get the link parameters for MediaTransformOutput::toHtml() from given
* frame parameters supplied by the Parser.
- * @param $frameParams The frame parameters
- * @param $query An optional query string to add to description page links
+ * @param array $frameParams The frame parameters
+ * @param string $query An optional query string to add to description page links
+ * @param Parser|null $parser
+ * @return array
*/
- function getImageLinkMTOParams( $frameParams, $query = '' ) {
- $mtoParams = array();
+ private static function getImageLinkMTOParams( $frameParams, $query = '', $parser = null ) {
+ $mtoParams = [];
if ( isset( $frameParams['link-url'] ) && $frameParams['link-url'] !== '' ) {
$mtoParams['custom-url-link'] = $frameParams['link-url'];
if ( isset( $frameParams['link-target'] ) ) {
$mtoParams['custom-target-link'] = $frameParams['link-target'];
}
+ if ( $parser ) {
+ $extLinkAttrs = $parser->getExternalLinkAttribs( $frameParams['link-url'] );
+ foreach ( $extLinkAttrs as $name => $val ) {
+ // Currently could include 'rel' and 'target'
+ $mtoParams['parser-extlink-' . $name] = $val;
+ }
+ }
} elseif ( isset( $frameParams['link-title'] ) && $frameParams['link-title'] !== '' ) {
- $mtoParams['custom-title-link'] = $this->normaliseSpecialPage( $frameParams['link-title'] );
+ $mtoParams['custom-title-link'] = Title::newFromLinkTarget(
+ self::normaliseSpecialPage( $frameParams['link-title'] )
+ );
} elseif ( !empty( $frameParams['no-link'] ) ) {
// No link
} else {
@@ -569,321 +494,479 @@ class Linker {
/**
* Make HTML for a thumbnail including image, border and caption
- * @param $title Title object
- * @param $file File object or false if it doesn't exist
- * @param $label String
- * @param $alt String
- * @param $align String
- * @param $params Array
- * @param $framed Boolean
- * @param $manualthumb String
+ * @param Title $title
+ * @param File|bool $file File object or false if it doesn't exist
+ * @param string $label
+ * @param string $alt
+ * @param string $align
+ * @param array $params
+ * @param bool $framed
+ * @param string $manualthumb
+ * @return string
*/
- function makeThumbLinkObj( Title $title, $file, $label = '', $alt, $align = 'right', $params = array(), $framed = false , $manualthumb = "" ) {
- $frameParams = array(
+ public static function makeThumbLinkObj( Title $title, $file, $label = '', $alt,
+ $align = 'right', $params = [], $framed = false, $manualthumb = ""
+ ) {
+ $frameParams = [
'alt' => $alt,
'caption' => $label,
'align' => $align
- );
- if ( $framed ) $frameParams['framed'] = true;
- if ( $manualthumb ) $frameParams['manualthumb'] = $manualthumb;
- return $this->makeThumbLink2( $title, $file, $frameParams, $params );
+ ];
+ if ( $framed ) {
+ $frameParams['framed'] = true;
+ }
+ if ( $manualthumb ) {
+ $frameParams['manualthumb'] = $manualthumb;
+ }
+ return self::makeThumbLink2( $title, $file, $frameParams, $params );
}
- function makeThumbLink2( Title $title, $file, $frameParams = array(), $handlerParams = array(), $time = false, $query = "" ) {
- global $wgStylePath;
+ /**
+ * @param Title $title
+ * @param File $file
+ * @param array $frameParams
+ * @param array $handlerParams
+ * @param bool $time
+ * @param string $query
+ * @return string
+ */
+ public static function makeThumbLink2( Title $title, $file, $frameParams = [],
+ $handlerParams = [], $time = false, $query = ""
+ ) {
$exists = $file && $file->exists();
- # Shortcuts
- $fp =& $frameParams;
- $hp =& $handlerParams;
-
- $page = isset( $hp['page'] ) ? $hp['page'] : false;
- if ( !isset( $fp['align'] ) ) $fp['align'] = 'right';
- if ( !isset( $fp['alt'] ) ) $fp['alt'] = '';
- if ( !isset( $fp['title'] ) ) $fp['title'] = '';
- if ( !isset( $fp['caption'] ) ) $fp['caption'] = '';
+ $page = isset( $handlerParams['page'] ) ? $handlerParams['page'] : false;
+ if ( !isset( $frameParams['align'] ) ) {
+ $frameParams['align'] = 'right';
+ }
+ if ( !isset( $frameParams['alt'] ) ) {
+ $frameParams['alt'] = '';
+ }
+ if ( !isset( $frameParams['title'] ) ) {
+ $frameParams['title'] = '';
+ }
+ if ( !isset( $frameParams['caption'] ) ) {
+ $frameParams['caption'] = '';
+ }
- if ( empty( $hp['width'] ) ) {
+ if ( empty( $handlerParams['width'] ) ) {
// Reduce width for upright images when parameter 'upright' is used
- $hp['width'] = isset( $fp['upright'] ) ? 130 : 180;
+ $handlerParams['width'] = isset( $frameParams['upright'] ) ? 130 : 180;
}
$thumb = false;
+ $noscale = false;
+ $manualthumb = false;
if ( !$exists ) {
- $outerWidth = $hp['width'] + 2;
+ $outerWidth = $handlerParams['width'] + 2;
} else {
- if ( isset( $fp['manualthumb'] ) ) {
+ if ( isset( $frameParams['manualthumb'] ) ) {
# Use manually specified thumbnail
- $manual_title = Title::makeTitleSafe( NS_FILE, $fp['manualthumb'] );
+ $manual_title = Title::makeTitleSafe( NS_FILE, $frameParams['manualthumb'] );
if ( $manual_title ) {
$manual_img = wfFindFile( $manual_title );
if ( $manual_img ) {
- $thumb = $manual_img->getUnscaledThumb( $hp );
+ $thumb = $manual_img->getUnscaledThumb( $handlerParams );
+ $manualthumb = true;
} else {
$exists = false;
}
}
- } elseif ( isset( $fp['framed'] ) ) {
+ } elseif ( isset( $frameParams['framed'] ) ) {
// Use image dimensions, don't scale
- $thumb = $file->getUnscaledThumb( $hp );
+ $thumb = $file->getUnscaledThumb( $handlerParams );
+ $noscale = true;
} 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
+ # This is a hack to maintain compatibility with arbitrary pre-1.10 behavior
$srcWidth = $file->getWidth( $page );
- if ( $srcWidth && !$file->mustRender() && $hp['width'] > $srcWidth ) {
- $hp['width'] = $srcWidth;
+ if ( $srcWidth && !$file->mustRender() && $handlerParams['width'] > $srcWidth ) {
+ $handlerParams['width'] = $srcWidth;
}
- $thumb = $file->transform( $hp );
+ $thumb = $file->transform( $handlerParams );
}
if ( $thumb ) {
$outerWidth = $thumb->getWidth() + 2;
} else {
- $outerWidth = $hp['width'] + 2;
+ $outerWidth = $handlerParams['width'] + 2;
}
}
# ThumbnailImage::toHtml() already adds page= onto the end of DjVu URLs
# So we don't need to pass it here in $query. However, the URL for the
- # zoom icon still needs it, so we make a unique query for it. See bug 14771
+ # zoom icon still needs it, so we make a unique query for it. See T16771
$url = $title->getLocalURL( $query );
if ( $page ) {
- $url = wfAppendQuery( $url, 'page=' . urlencode( $page ) );
+ $url = wfAppendQuery( $url, [ 'page' => $page ] );
+ }
+ if ( $manualthumb
+ && !isset( $frameParams['link-title'] )
+ && !isset( $frameParams['link-url'] )
+ && !isset( $frameParams['no-link'] ) ) {
+ $frameParams['link-url'] = $url;
}
- $s = "
";
+ $s = "
"
+ . "
";
+
if ( !$exists ) {
- $s .= $this->makeBrokenImageLinkObj( $title, $fp['title'], '', '', '', $time == true );
+ $s .= self::makeBrokenImageLinkObj( $title, $frameParams['title'], '', '', '', $time == true );
$zoomIcon = '';
} elseif ( !$thumb ) {
- $s .= htmlspecialchars( wfMsg( 'thumbnail_error', '' ) );
+ $s .= wfMessage( 'thumbnail_error', '' )->escaped();
$zoomIcon = '';
} else {
- $params = array(
- 'alt' => $fp['alt'],
- 'title' => $fp['title'],
- 'img-class' => 'thumbimage' );
- $params = $this->getImageLinkMTOParams( $fp, $query ) + $params;
+ if ( !$noscale && !$manualthumb ) {
+ self::processResponsiveImages( $file, $thumb, $handlerParams );
+ }
+ $params = [
+ 'alt' => $frameParams['alt'],
+ 'title' => $frameParams['title'],
+ 'img-class' => ( isset( $frameParams['class'] ) && $frameParams['class'] !== ''
+ ? $frameParams['class'] . ' '
+ : '' ) . 'thumbimage'
+ ];
+ $params = self::getImageLinkMTOParams( $frameParams, $query ) + $params;
$s .= $thumb->toHtml( $params );
- if ( isset( $fp['framed'] ) ) {
+ if ( isset( $frameParams['framed'] ) ) {
$zoomIcon = "";
} else {
- $zoomIcon = '
';
+ $zoomIcon = Html::rawElement( 'div', [ 'class' => 'magnify' ],
+ Html::rawElement( 'a', [
+ 'href' => $url,
+ 'class' => 'internal',
+ 'title' => wfMessage( 'thumbnail-more' )->text() ],
+ "" ) );
}
}
- $s .= '
' . $zoomIcon . $fp['caption'] . "
";
+ $s .= '
' . $zoomIcon . $frameParams['caption'] . "
";
return str_replace( "\n", ' ', $s );
}
+ /**
+ * Process responsive images: add 1.5x and 2x subimages to the thumbnail, where
+ * applicable.
+ *
+ * @param File $file
+ * @param MediaTransformOutput $thumb
+ * @param array $hp Image parameters
+ */
+ public static function processResponsiveImages( $file, $thumb, $hp ) {
+ global $wgResponsiveImages;
+ if ( $wgResponsiveImages && $thumb && !$thumb->isError() ) {
+ $hp15 = $hp;
+ $hp15['width'] = round( $hp['width'] * 1.5 );
+ $hp20 = $hp;
+ $hp20['width'] = $hp['width'] * 2;
+ if ( isset( $hp['height'] ) ) {
+ $hp15['height'] = round( $hp['height'] * 1.5 );
+ $hp20['height'] = $hp['height'] * 2;
+ }
+
+ $thumb15 = $file->transform( $hp15 );
+ $thumb20 = $file->transform( $hp20 );
+ if ( $thumb15 && !$thumb15->isError() && $thumb15->getUrl() !== $thumb->getUrl() ) {
+ $thumb->responsiveUrls['1.5'] = $thumb15->getUrl();
+ }
+ if ( $thumb20 && !$thumb20->isError() && $thumb20->getUrl() !== $thumb->getUrl() ) {
+ $thumb->responsiveUrls['2'] = $thumb20->getUrl();
+ }
+ }
+ }
+
/**
* Make a "broken" link to an image
*
- * @param $title Title object
- * @param $text String: link label
- * @param $query String: query string
- * @param $trail String: link trail
- * @param $prefix String: link prefix
- * @param $time Boolean: a file of a certain timestamp was requested
- * @return String
+ * @since 1.16.3
+ * @param Title $title
+ * @param string $label Link label (plain text)
+ * @param string $query Query string
+ * @param string $unused1 Unused parameter kept for b/c
+ * @param string $unused2 Unused parameter kept for b/c
+ * @param bool $time A file of a certain timestamp was requested
+ * @return string
*/
- public function makeBrokenImageLinkObj( $title, $text = '', $query = '', $trail = '', $prefix = '', $time = false ) {
- global $wgEnableUploads, $wgUploadMissingFileUrl;
- if ( $title instanceof Title ) {
- wfProfileIn( __METHOD__ );
- $currentExists = $time ? ( wfFindFile( $title ) != false ) : false;
-
- list( $inside, $trail ) = self::splitTrail( $trail );
- if ( $text == '' )
- $text = htmlspecialchars( $title->getPrefixedText() );
-
- if ( ( $wgUploadMissingFileUrl || $wgEnableUploads ) && !$currentExists ) {
- $redir = RepoGroup::singleton()->getLocalRepo()->checkRedirect( $title );
-
- if ( $redir ) {
- wfProfileOut( __METHOD__ );
- return $this->linkKnown( $title, "$prefix$text$inside", array(), $query ) . $trail;
- }
+ public static function makeBrokenImageLinkObj( $title, $label = '',
+ $query = '', $unused1 = '', $unused2 = '', $time = false
+ ) {
+ if ( !$title instanceof Title ) {
+ wfWarn( __METHOD__ . ': Requires $title to be a Title object.' );
+ return "" . htmlspecialchars( $label );
+ }
+
+ global $wgEnableUploads, $wgUploadMissingFileUrl, $wgUploadNavigationUrl;
+ if ( $label == '' ) {
+ $label = $title->getPrefixedText();
+ }
+ $encLabel = htmlspecialchars( $label );
+ $currentExists = $time ? ( wfFindFile( $title ) != false ) : false;
+
+ if ( ( $wgUploadMissingFileUrl || $wgUploadNavigationUrl || $wgEnableUploads )
+ && !$currentExists
+ ) {
+ $redir = RepoGroup::singleton()->getLocalRepo()->checkRedirect( $title );
+
+ if ( $redir ) {
+ // We already know it's a redirect, so mark it
+ // accordingly
+ return self::link(
+ $title,
+ $encLabel,
+ [ 'class' => 'mw-redirect' ],
+ wfCgiToArray( $query ),
+ [ 'known', 'noclasses' ]
+ );
+ }
- $href = $this->getUploadUrl( $title, $query );
+ $href = self::getUploadUrl( $title, $query );
- wfProfileOut( __METHOD__ );
- return '
' .
- htmlspecialchars( $prefix . $text . $inside, ENT_NOQUOTES ) . '' . $trail;
- } else {
- wfProfileOut( __METHOD__ );
- return $this->linkKnown( $title, "$prefix$text$inside", array(), $query ) . $trail;
- }
- } else {
- wfProfileOut( __METHOD__ );
- return "{$prefix}{$text}{$trail}";
+ return '
' .
+ $encLabel . '';
}
+
+ return self::link( $title, $encLabel, [], wfCgiToArray( $query ), [ 'known', 'noclasses' ] );
}
/**
* Get the URL to upload a certain file
*
- * @param $destFile Title object of the file to upload
- * @param $query String: urlencoded query string to prepend
- * @return String: urlencoded URL
- */
- protected function getUploadUrl( $destFile, $query = '' ) {
- global $wgUploadMissingFileUrl;
- $q = 'wpDestFile=' . $destFile->getPartialUrl();
- if ( $query != '' )
+ * @since 1.16.3
+ * @param Title $destFile Title object of the file to upload
+ * @param string $query Urlencoded query string to prepend
+ * @return string Urlencoded URL
+ */
+ protected static function getUploadUrl( $destFile, $query = '' ) {
+ global $wgUploadMissingFileUrl, $wgUploadNavigationUrl;
+ $q = 'wpDestFile=' . $destFile->getPartialURL();
+ if ( $query != '' ) {
$q .= '&' . $query;
+ }
if ( $wgUploadMissingFileUrl ) {
return wfAppendQuery( $wgUploadMissingFileUrl, $q );
+ } elseif ( $wgUploadNavigationUrl ) {
+ return wfAppendQuery( $wgUploadNavigationUrl, $q );
} else {
$upload = SpecialPage::getTitleFor( 'Upload' );
- return $upload->getLocalUrl( $q );
+ return $upload->getLocalURL( $q );
}
}
/**
* Create a direct link to a given uploaded file.
*
- * @param $title Title object.
- * @param $text String: pre-sanitized HTML
- * @param $time string: time image was created
- * @return String: HTML
+ * @since 1.16.3
+ * @param Title $title
+ * @param string $html Pre-sanitized HTML
+ * @param string $time MW timestamp of file creation time
+ * @return string HTML
+ */
+ public static function makeMediaLinkObj( $title, $html = '', $time = false ) {
+ $img = wfFindFile( $title, [ 'time' => $time ] );
+ return self::makeMediaLinkFile( $title, $img, $html );
+ }
+
+ /**
+ * Create a direct link to a given uploaded file.
+ * This will make a broken link if $file is false.
+ *
+ * @since 1.16.3
+ * @param Title $title
+ * @param File|bool $file File object or false
+ * @param string $html Pre-sanitized HTML
+ * @return string HTML
*
* @todo Handle invalid or missing images better.
*/
- public function makeMediaLinkObj( $title, $text = '', $time = false ) {
- if ( is_null( $title ) ) {
- # # # HOTFIX. Instead of breaking, return empty string.
- return $text;
+ public static function makeMediaLinkFile( Title $title, $file, $html = '' ) {
+ if ( $file && $file->exists() ) {
+ $url = $file->getUrl();
+ $class = 'internal';
} else {
- $img = wfFindFile( $title, array( 'time' => $time ) );
- if ( $img ) {
- $url = $img->getURL();
- $class = 'internal';
- } else {
- $url = $this->getUploadUrl( $title );
- $class = 'new';
- }
- $alt = htmlspecialchars( $title->getText(), ENT_QUOTES );
- if ( $text == '' ) {
- $text = $alt;
- }
- $u = htmlspecialchars( $url );
- return "
{$text}";
+ $url = self::getUploadUrl( $title );
+ $class = 'new';
}
+
+ $alt = $title->getText();
+ if ( $html == '' ) {
+ $html = $alt;
+ }
+
+ $ret = '';
+ $attribs = [
+ 'href' => $url,
+ 'class' => $class,
+ 'title' => $alt
+ ];
+
+ if ( !Hooks::run( 'LinkerMakeMediaLinkFile',
+ [ $title, $file, &$html, &$attribs, &$ret ] ) ) {
+ wfDebug( "Hook LinkerMakeMediaLinkFile changed the output of link "
+ . "with url {$url} and text {$html} to {$ret}\n", true );
+ return $ret;
+ }
+
+ return Html::rawElement( 'a', $attribs, $html );
}
/**
- * Make a link to a special page given its name and, optionally,
+ * Make a link to a special page given its name and, optionally,
* a message key from the link text.
- * Usage example: $skin->specialLink( 'recentchanges' )
+ * Usage example: Linker::specialLink( 'Recentchanges' )
+ *
+ * @since 1.16.3
+ * @param string $name
+ * @param string $key
+ * @return string
*/
- function specialLink( $name, $key = '' ) {
- if ( $key == '' ) { $key = strtolower( $name ); }
+ public static function specialLink( $name, $key = '' ) {
+ if ( $key == '' ) {
+ $key = strtolower( $name );
+ }
- return $this->linkKnown( SpecialPage::getTitleFor( $name ) , wfMsg( $key ) );
+ return self::linkKnown( SpecialPage::getTitleFor( $name ), wfMessage( $key )->text() );
}
/**
* Make an external link
- * @param $url String: URL to link to
- * @param $text String: text of link
- * @param $escape Boolean: do we escape the link text?
- * @param $linktype String: type of external link. Gets added to the classes
- * @param $attribs Array of extra attributes to
- *
- * @todo FIXME: This is a really crappy implementation. $linktype and
- * 'external' are mashed into the class attrib for the link (which is made
- * into a string). Then, if we've got additional params in $attribs, we
- * add to it. People using this might want to change the classes (or other
- * default link attributes), but passing $attribsText is just messy. Would
- * make a lot more sense to make put the classes into $attribs, let the
- * hook play with them, *then* expand it all at once.
+ * @since 1.16.3. $title added in 1.21
+ * @param string $url URL to link to
+ * @param string $text Text of link
+ * @param bool $escape Do we escape the link text?
+ * @param string $linktype Type of external link. Gets added to the classes
+ * @param array $attribs Array of extra attributes to
+ * @param Title|null $title Title object used for title specific link attributes
+ * @return string
*/
- function makeExternalLink( $url, $text, $escape = true, $linktype = '', $attribs = array() ) {
- if ( isset( $attribs['class'] ) ) {
- # yet another hack :(
- $class = $attribs['class'];
- } else {
- $class = "external $linktype";
+ public static function makeExternalLink( $url, $text, $escape = true,
+ $linktype = '', $attribs = [], $title = null
+ ) {
+ global $wgTitle;
+ $class = "external";
+ if ( $linktype ) {
+ $class .= " $linktype";
+ }
+ if ( isset( $attribs['class'] ) && $attribs['class'] ) {
+ $class .= " {$attribs['class']}";
}
+ $attribs['class'] = $class;
- $attribsText = $this->getExternalLinkAttributes( $class );
- $url = htmlspecialchars( $url );
if ( $escape ) {
$text = htmlspecialchars( $text );
}
+
+ if ( !$title ) {
+ $title = $wgTitle;
+ }
+ $newRel = Parser::getExternalLinkRel( $url, $title );
+ if ( !isset( $attribs['rel'] ) || $attribs['rel'] === '' ) {
+ $attribs['rel'] = $newRel;
+ } elseif ( $newRel !== '' ) {
+ // Merge the rel attributes.
+ $newRels = explode( ' ', $newRel );
+ $oldRels = explode( ' ', $attribs['rel'] );
+ $combined = array_unique( array_merge( $newRels, $oldRels ) );
+ $attribs['rel'] = implode( ' ', $combined );
+ }
$link = '';
- $success = wfRunHooks( 'LinkerMakeExternalLink', array( &$url, &$text, &$link, &$attribs, $linktype ) );
+ $success = Hooks::run( 'LinkerMakeExternalLink',
+ [ &$url, &$text, &$link, &$attribs, $linktype ] );
if ( !$success ) {
- wfDebug( "Hook LinkerMakeExternalLink changed the output of link with url {$url} and text {$text} to {$link}\n", true );
+ wfDebug( "Hook LinkerMakeExternalLink changed the output of link "
+ . "with url {$url} and text {$text} to {$link}\n", true );
return $link;
}
- if ( $attribs ) {
- $attribsText .= Html::expandAttributes( $attribs );
- }
- return '' . $text . '';
+ $attribs['href'] = $url;
+ return Html::rawElement( 'a', $attribs, $text );
}
/**
* 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 ) {
+ * @param int $userId User id in database.
+ * @param string $userName User name in database.
+ * @param string $altUserName Text to display instead of the user name (optional)
+ * @return string HTML fragment
+ * @since 1.16.3. $altUserName was added in 1.19.
+ */
+ public static function userLink( $userId, $userName, $altUserName = false ) {
+ $classes = 'mw-userlink';
if ( $userId == 0 ) {
- $page = SpecialPage::getTitleFor( 'Contributions', $userText );
+ $page = SpecialPage::getTitleFor( 'Contributions', $userName );
+ if ( $altUserName === false ) {
+ $altUserName = IP::prettifyIP( $userName );
+ }
+ $classes .= ' mw-anonuserlink'; // Separate link class for anons (T45179)
} else {
- $page = Title::makeTitle( NS_USER, $userText );
+ $page = Title::makeTitle( NS_USER, $userName );
}
- return $this->link( $page, htmlspecialchars( $userText ), array( 'class' => 'mw-userlink' ) );
+
+ // Wrap the output with
tags for directionality isolation
+ return self::link(
+ $page,
+ '' . htmlspecialchars( $altUserName !== false ? $altUserName : $userName ) . '',
+ [ 'class' => $classes ]
+ );
}
/**
* Generate standard user tool links (talk, contributions, block link, etc.)
*
- * @param $userId Integer: user identifier
- * @param $userText String: user name or IP address
- * @param $redContribsWhenNoEdits Boolean: should the contributions link be
- * red if the user has no edits?
- * @param $flags Integer: customisation flags (e.g. self::TOOL_LINKS_NOBLOCK)
- * @param $edits Integer: user edit count (optional, for performance)
- * @return String: HTML fragment
- */
- public function userToolLinks( $userId, $userText, $redContribsWhenNoEdits = false, $flags = 0, $edits = null ) {
- global $wgUser, $wgDisableAnonTalk, $wgSysopUserBans, $wgLang;
+ * @since 1.16.3
+ * @param int $userId User identifier
+ * @param string $userText User name or IP address
+ * @param bool $redContribsWhenNoEdits Should the contributions link be
+ * red if the user has no edits?
+ * @param int $flags Customisation flags (e.g. Linker::TOOL_LINKS_NOBLOCK
+ * and Linker::TOOL_LINKS_EMAIL).
+ * @param int $edits User edit count (optional, for performance)
+ * @return string HTML fragment
+ */
+ public static function userToolLinks(
+ $userId, $userText, $redContribsWhenNoEdits = false, $flags = 0, $edits = null
+ ) {
+ global $wgUser, $wgDisableAnonTalk, $wgLang;
$talkable = !( $wgDisableAnonTalk && 0 == $userId );
- $blockable = ( $wgSysopUserBans || 0 == $userId ) && !$flags & self::TOOL_LINKS_NOBLOCK;
+ $blockable = !( $flags & self::TOOL_LINKS_NOBLOCK );
+ $addEmailLink = $flags & self::TOOL_LINKS_EMAIL && $userId;
- $items = array();
+ $items = [];
if ( $talkable ) {
- $items[] = $this->userTalkLink( $userId, $userText );
+ $items[] = self::userTalkLink( $userId, $userText );
}
if ( $userId ) {
// check if the user has an edit
- $attribs = array();
+ $attribs = [];
+ $attribs['class'] = 'mw-usertoollinks-contribs';
if ( $redContribsWhenNoEdits ) {
- $count = !is_null( $edits ) ? $edits : User::edits( $userId );
- if ( $count == 0 ) {
- $attribs['class'] = 'new';
+ if ( intval( $edits ) === 0 && $edits !== 0 ) {
+ $user = User::newFromId( $userId );
+ $edits = $user->getEditCount();
+ }
+ if ( $edits === 0 ) {
+ $attribs['class'] .= ' new';
}
}
$contribsPage = SpecialPage::getTitleFor( 'Contributions', $userText );
- $items[] = $this->link( $contribsPage, wfMsgHtml( 'contribslink' ), $attribs );
+ $items[] = self::link( $contribsPage, wfMessage( 'contribslink' )->escaped(), $attribs );
}
if ( $blockable && $wgUser->isAllowed( 'block' ) ) {
- $items[] = $this->blockLink( $userId, $userText );
+ $items[] = self::blockLink( $userId, $userText );
+ }
+
+ if ( $addEmailLink && $wgUser->canSendEmail() ) {
+ $items[] = self::emailLink( $userId, $userText );
}
+ Hooks::run( 'UserToolLinksEdit', [ $userId, $userText, &$items ] );
+
if ( $items ) {
- return ' (' . $wgLang->pipeList( $items ) . ')';
+ return wfMessage( 'word-separator' )->escaped()
+ . ''
+ . wfMessage( 'parentheses' )->rawParams( $wgLang->pipeList( $items ) )->escaped()
+ . '';
} else {
return '';
}
@@ -891,53 +974,75 @@ class Linker {
/**
* Alias for userToolLinks( $userId, $userText, true );
- * @param $userId Integer: user identifier
- * @param $userText String: user name or IP address
- * @param $edits Integer: user edit count (optional, for performance)
+ * @since 1.16.3
+ * @param int $userId User identifier
+ * @param string $userText User name or IP address
+ * @param int $edits User edit count (optional, for performance)
+ * @return string
*/
- public function userToolLinksRedContribs( $userId, $userText, $edits = null ) {
- return $this->userToolLinks( $userId, $userText, true, 0, $edits );
+ public static function userToolLinksRedContribs( $userId, $userText, $edits = null ) {
+ return self::userToolLinks( $userId, $userText, true, 0, $edits );
}
-
/**
- * @param $userId Integer: user id in database.
- * @param $userText String: user name in database.
- * @return String: HTML fragment with user talk link
- * @private
+ * @since 1.16.3
+ * @param int $userId User id in database.
+ * @param string $userText User name in database.
+ * @return string HTML fragment with user talk link
*/
- function userTalkLink( $userId, $userText ) {
+ public static function userTalkLink( $userId, $userText ) {
$userTalkPage = Title::makeTitle( NS_USER_TALK, $userText );
- $userTalkLink = $this->link( $userTalkPage, wfMsgHtml( 'talkpagelinktext' ) );
+ $moreLinkAttribs['class'] = 'mw-usertoollinks-talk';
+ $userTalkLink = self::link( $userTalkPage,
+ wfMessage( 'talkpagelinktext' )->escaped(),
+ $moreLinkAttribs );
return $userTalkLink;
}
/**
- * @param $userId Integer: userid
- * @param $userText String: user name in database.
- * @return String: HTML fragment with block link
- * @private
+ * @since 1.16.3
+ * @param int $userId Userid
+ * @param string $userText User name in database.
+ * @return string HTML fragment with block link
*/
- function blockLink( $userId, $userText ) {
- $blockPage = SpecialPage::getTitleFor( 'Blockip', $userText );
- $blockLink = $this->link( $blockPage, wfMsgHtml( 'blocklink' ) );
+ public static function blockLink( $userId, $userText ) {
+ $blockPage = SpecialPage::getTitleFor( 'Block', $userText );
+ $moreLinkAttribs['class'] = 'mw-usertoollinks-block';
+ $blockLink = self::link( $blockPage,
+ wfMessage( 'blocklink' )->escaped(),
+ $moreLinkAttribs );
return $blockLink;
}
+ /**
+ * @param int $userId Userid
+ * @param string $userText User name in database.
+ * @return string HTML fragment with e-mail user link
+ */
+ public static function emailLink( $userId, $userText ) {
+ $emailPage = SpecialPage::getTitleFor( 'Emailuser', $userText );
+ $moreLinkAttribs['class'] = 'mw-usertoollinks-mail';
+ $emailLink = self::link( $emailPage,
+ wfMessage( 'emaillink' )->escaped(),
+ $moreLinkAttribs );
+ return $emailLink;
+ }
+
/**
* Generate a user link if the current user is allowed to view it
- * @param $rev Revision object.
- * @param $isPublic Boolean: show only if all users can see it
- * @return String: HTML fragment
+ * @since 1.16.3
+ * @param Revision $rev
+ * @param bool $isPublic Show only if all users can see it
+ * @return string HTML fragment
*/
- function revUserLink( $rev, $isPublic = false ) {
+ public static function revUserLink( $rev, $isPublic = false ) {
if ( $rev->isDeleted( Revision::DELETED_USER ) && $isPublic ) {
- $link = wfMsgHtml( 'rev-deleted-user' );
- } else if ( $rev->userCan( Revision::DELETED_USER ) ) {
- $link = $this->userLink( $rev->getUser( Revision::FOR_THIS_USER ),
+ $link = wfMessage( 'rev-deleted-user' )->escaped();
+ } elseif ( $rev->userCan( Revision::DELETED_USER ) ) {
+ $link = self::userLink( $rev->getUser( Revision::FOR_THIS_USER ),
$rev->getUserText( Revision::FOR_THIS_USER ) );
} else {
- $link = wfMsgHtml( 'rev-deleted-user' );
+ $link = wfMessage( 'rev-deleted-user' )->escaped();
}
if ( $rev->isDeleted( Revision::DELETED_USER ) ) {
return '' . $link . '';
@@ -947,20 +1052,21 @@ class Linker {
/**
* Generate a user tool link cluster if the current user is allowed to view it
- * @param $rev Revision object.
- * @param $isPublic Boolean: show only if all users can see it
+ * @since 1.16.3
+ * @param Revision $rev
+ * @param bool $isPublic Show only if all users can see it
* @return string HTML
*/
- function revUserTools( $rev, $isPublic = false ) {
+ public static function revUserTools( $rev, $isPublic = false ) {
if ( $rev->isDeleted( Revision::DELETED_USER ) && $isPublic ) {
- $link = wfMsgHtml( 'rev-deleted-user' );
- } else if ( $rev->userCan( Revision::DELETED_USER ) ) {
+ $link = wfMessage( 'rev-deleted-user' )->escaped();
+ } elseif ( $rev->userCan( Revision::DELETED_USER ) ) {
$userId = $rev->getUser( Revision::FOR_THIS_USER );
$userText = $rev->getUserText( Revision::FOR_THIS_USER );
- $link = $this->userLink( $userId, $userText ) .
- ' ' . $this->userToolLinks( $userId, $userText );
+ $link = self::userLink( $userId, $userText )
+ . self::userToolLinks( $userId, $userText );
} else {
- $link = wfMsgHtml( 'rev-deleted-user' );
+ $link = wfMessage( 'rev-deleted-user' )->escaped();
}
if ( $rev->isDeleted( Revision::DELETED_USER ) ) {
return ' ' . $link . '';
@@ -971,203 +1077,297 @@ class Linker {
/**
* 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
+ * summaries. It escapes any HTML in the summary, but adds some CSS to format
* auto-generated comments (from section editing) and formats [[wikilinks]].
*
* @author Erik Moeller
+ * @since 1.16.3. $wikiId added in 1.26
*
* Note: there's not always a title to pass to this function.
* Since you can't set a default parameter for a reference, I've turned it
* temporarily to a value pass. Should be adjusted further. --brion
*
- * @param $comment String
- * @param $title Mixed: Title object (to generate link to the section in autocomment) or null
- * @param $local Boolean: whether section links should refer to local page
+ * @param string $comment
+ * @param Title|null $title Title object (to generate link to the section in autocomment)
+ * or null
+ * @param bool $local Whether section links should refer to local page
+ * @param string|null $wikiId Id (as used by WikiMap) of the wiki to generate links to.
+ * For use with external changes.
+ *
+ * @return mixed|string
*/
- function formatComment( $comment, $title = null, $local = false ) {
- wfProfileIn( __METHOD__ );
-
+ public static function formatComment(
+ $comment, $title = null, $local = false, $wikiId = null
+ ) {
# Sanitize text a bit:
$comment = str_replace( "\n", " ", $comment );
- # Allow HTML entities (for bug 13815)
+ # Allow HTML entities (for T15815)
$comment = Sanitizer::escapeHtmlAllowEntities( $comment );
# Render autocomments and make links:
- $comment = $this->formatAutocomments( $comment, $title, $local );
- $comment = $this->formatLinksInComment( $comment, $title, $local );
+ $comment = self::formatAutocomments( $comment, $title, $local, $wikiId );
+ $comment = self::formatLinksInComment( $comment, $title, $local, $wikiId );
- wfProfileOut( __METHOD__ );
return $comment;
}
/**
+ * Converts autogenerated comments in edit summaries into section links.
+ *
* 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 String: comment text
- * @param $title An optional title object used to links to sections
- * @param $local Boolean: whether section links should refer to local page
- * @return String: formatted comment
- */
- private function formatAutocomments( $comment, $title = null, $local = false ) {
- // Bah!
- $this->autocommentTitle = $title;
- $this->autocommentLocal = $local;
+ * @param string $comment Comment text
+ * @param Title|null $title An optional title object used to links to sections
+ * @param bool $local Whether section links should refer to local page
+ * @param string|null $wikiId Id of the wiki to link to (if not the local wiki),
+ * as used by WikiMap.
+ *
+ * @return string Formatted comment (wikitext)
+ */
+ private static function formatAutocomments(
+ $comment, $title = null, $local = false, $wikiId = null
+ ) {
+ // @todo $append here is something of a hack to preserve the status
+ // quo. Someone who knows more about bidi and such should decide
+ // (1) what sane rendering even *is* for an LTR edit summary on an RTL
+ // wiki, both when autocomments exist and when they don't, and
+ // (2) what markup will make that actually happen.
+ $append = '';
$comment = preg_replace_callback(
- '!(.*)/\*\s*(.*?)\s*\*/(.*)!',
- array( $this, 'formatAutocommentsCallback' ),
- $comment );
- unset( $this->autocommentTitle );
- unset( $this->autocommentLocal );
- return $comment;
- }
-
- private function formatAutocommentsCallback( $match ) {
- $title = $this->autocommentTitle;
- $local = $this->autocommentLocal;
-
- $pre = $match[1];
- $auto = $match[2];
- $post = $match[3];
- $link = '';
- if ( $title ) {
- $section = $auto;
-
- # Remove links that a user may have manually put in the autosummary
- # This could be improved by copying as much of Parser::stripSectionName as desired.
- $section = str_replace( '[[:', '', $section );
- $section = str_replace( '[[', '', $section );
- $section = str_replace( ']]', '', $section );
-
- $section = Sanitizer::normalizeSectionNameWhitespace( $section ); # bug 22784
- if ( $local ) {
- $sectionTitle = Title::newFromText( '#' . $section );
- } else {
- $sectionTitle = Title::makeTitleSafe( $title->getNamespace(),
- $title->getDBkey(), $section );
- }
- if ( $sectionTitle ) {
- $link = $this->link( $sectionTitle,
- htmlspecialchars( wfMsgForContent( 'sectionlink' ) ), array(), array(),
- 'noclasses' );
- } else {
- $link = '';
- }
- }
- $auto = "$link$auto";
- if ( $pre ) {
- # written summary $presep autocomment (summary /* section */)
- $auto = wfMsgExt( 'autocomment-prefix', array( 'escapenoentities', 'content' ) ) . $auto;
- }
- if ( $post ) {
- # autocomment $postsep written summary (/* section */ summary)
- $auto .= wfMsgExt( 'colon-separator', array( 'escapenoentities', 'content' ) );
- }
- $auto = '';
- $comment = $pre . $auto . $post;
- return $comment;
+ // To detect the presence of content before or after the
+ // auto-comment, we use capturing groups inside optional zero-width
+ // assertions. But older versions of PCRE can't directly make
+ // zero-width assertions optional, so wrap them in a non-capturing
+ // group.
+ '!(?:(?<=(.)))?/\*\s*(.*?)\s*\*/(?:(?=(.)))?!',
+ function ( $match ) use ( $title, $local, $wikiId, &$append ) {
+ global $wgLang;
+
+ // Ensure all match positions are defined
+ $match += [ '', '', '', '' ];
+
+ $pre = $match[1] !== '';
+ $auto = $match[2];
+ $post = $match[3] !== '';
+ $comment = null;
+
+ Hooks::run(
+ 'FormatAutocomments',
+ [ &$comment, $pre, $auto, $post, $title, $local, $wikiId ]
+ );
+
+ if ( $comment === null ) {
+ $link = '';
+ if ( $title ) {
+ $section = $auto;
+ # Remove links that a user may have manually put in the autosummary
+ # This could be improved by copying as much of Parser::stripSectionName as desired.
+ $section = str_replace( '[[:', '', $section );
+ $section = str_replace( '[[', '', $section );
+ $section = str_replace( ']]', '', $section );
+
+ $section = Sanitizer::normalizeSectionNameWhitespace( $section ); # T24784
+ if ( $local ) {
+ $sectionTitle = Title::newFromText( '#' . $section );
+ } else {
+ $sectionTitle = Title::makeTitleSafe( $title->getNamespace(),
+ $title->getDBkey(), Sanitizer::decodeCharReferences( $section ) );
+ }
+ if ( $sectionTitle ) {
+ $link = Linker::makeCommentLink( $sectionTitle, $wgLang->getArrow(), $wikiId, 'noclasses' );
+ } else {
+ $link = '';
+ }
+ }
+ if ( $pre ) {
+ # written summary $presep autocomment (summary /* section */)
+ $pre = wfMessage( 'autocomment-prefix' )->inContentLanguage()->escaped();
+ }
+ if ( $post ) {
+ # autocomment $postsep written summary (/* section */ summary)
+ $auto .= wfMessage( 'colon-separator' )->inContentLanguage()->escaped();
+ }
+ $auto = '';
+ $comment = $pre . $link . $wgLang->getDirMark()
+ . '' . $auto;
+ $append .= '';
+ }
+ return $comment;
+ },
+ $comment
+ );
+ return $comment . $append;
}
/**
* Formats wiki links and media links in text; all other wiki formatting
* is ignored
*
- * @todo Fixme: doesn't handle sub-links as in image thumb texts like the main parser
- * @param $comment String: text to format links in
- * @param $title An optional title object used to links to sections
- * @param $local Boolean: whether section links should refer to local page
- * @return String
+ * @since 1.16.3. $wikiId added in 1.26
+ * @todo FIXME: Doesn't handle sub-links as in image thumb texts like the main parser
+ *
+ * @param string $comment Text to format links in. WARNING! Since the output of this
+ * function is html, $comment must be sanitized for use as html. You probably want
+ * to pass $comment through Sanitizer::escapeHtmlAllowEntities() before calling
+ * this function.
+ * @param Title|null $title An optional title object used to links to sections
+ * @param bool $local Whether section links should refer to local page
+ * @param string|null $wikiId Id of the wiki to link to (if not the local wiki),
+ * as used by WikiMap.
+ *
+ * @return string
*/
- public function formatLinksInComment( $comment, $title = null, $local = false ) {
- $this->commentContextTitle = $title;
- $this->commentLocal = $local;
- $html = preg_replace_callback(
- '/\[\[:?(.*?)(\|(.*?))*\]\]([^[]*)/',
- array( $this, 'formatLinksInCommentCallback' ),
- $comment );
- unset( $this->commentContextTitle );
- unset( $this->commentLocal );
- return $html;
- }
-
- protected function formatLinksInCommentCallback( $match ) {
- global $wgContLang;
+ public static function formatLinksInComment(
+ $comment, $title = null, $local = false, $wikiId = null
+ ) {
+ return preg_replace_callback(
+ '/
+ \[\[
+ :? # ignore optional leading colon
+ ([^\]|]+) # 1. link target; page names cannot include ] or |
+ (?:\|
+ # 2. link text
+ # Stop matching at ]] without relying on backtracking.
+ ((?:]?[^\]])*+)
+ )?
+ \]\]
+ ([^[]*) # 3. link trail (the text up until the next link)
+ /x',
+ function ( $match ) use ( $title, $local, $wikiId ) {
+ global $wgContLang;
+
+ $medians = '(?:' . preg_quote( MWNamespace::getCanonicalName( NS_MEDIA ), '/' ) . '|';
+ $medians .= preg_quote( $wgContLang->getNsText( NS_MEDIA ), '/' ) . '):';
+
+ $comment = $match[0];
+
+ # fix up urlencoded title texts (copied from Parser::replaceInternalLinks)
+ if ( strpos( $match[1], '%' ) !== false ) {
+ $match[1] = strtr(
+ rawurldecode( $match[1] ),
+ [ '<' => '<', '>' => '>' ]
+ );
+ }
- $medians = '(?:' . preg_quote( MWNamespace::getCanonicalName( NS_MEDIA ), '/' ) . '|';
- $medians .= preg_quote( $wgContLang->getNsText( NS_MEDIA ), '/' ) . '):';
+ # Handle link renaming [[foo|text]] will show link as "text"
+ if ( $match[2] != "" ) {
+ $text = $match[2];
+ } else {
+ $text = $match[1];
+ }
+ $submatch = [];
+ $thelink = null;
+ if ( preg_match( '/^' . $medians . '(.*)$/i', $match[1], $submatch ) ) {
+ # Media link; trail not supported.
+ $linkRegexp = '/\[\[(.*?)\]\]/';
+ $title = Title::makeTitleSafe( NS_FILE, $submatch[1] );
+ if ( $title ) {
+ $thelink = Linker::makeMediaLinkObj( $title, $text );
+ }
+ } else {
+ # Other kind of link
+ # Make sure its target is non-empty
+ if ( isset( $match[1][0] ) && $match[1][0] == ':' ) {
+ $match[1] = substr( $match[1], 1 );
+ }
+ if ( $match[1] !== false && $match[1] !== '' ) {
+ if ( preg_match( $wgContLang->linkTrail(), $match[3], $submatch ) ) {
+ $trail = $submatch[1];
+ } else {
+ $trail = "";
+ }
+ $linkRegexp = '/\[\[(.*?)\]\]' . preg_quote( $trail, '/' ) . '/';
+ list( $inside, $trail ) = Linker::splitTrail( $trail );
+
+ $linkText = $text;
+ $linkTarget = Linker::normalizeSubpageLink( $title, $match[1], $linkText );
+
+ $target = Title::newFromText( $linkTarget );
+ if ( $target ) {
+ if ( $target->getText() == '' && !$target->isExternal()
+ && !$local && $title
+ ) {
+ $target = $title->createFragmentTarget( $target->getFragment() );
+ }
- $comment = $match[0];
+ $thelink = Linker::makeCommentLink( $target, $linkText . $inside, $wikiId ) . $trail;
+ }
+ }
+ }
+ if ( $thelink ) {
+ // If the link is still valid, go ahead and replace it in!
+ $comment = preg_replace(
+ $linkRegexp,
+ StringUtils::escapeRegexReplacement( $thelink ),
+ $comment,
+ 1
+ );
+ }
- # fix up urlencoded title texts (copied from Parser::replaceInternalLinks)
- if ( strpos( $match[1], '%' ) !== false ) {
- $match[1] = str_replace( array( '<', '>' ), array( '<', '>' ), urldecode( $match[1] ) );
- }
+ return $comment;
+ },
+ $comment
+ );
+ }
- # Handle link renaming [[foo|text]] will show link as "text"
- if ( $match[3] != "" ) {
- $text = $match[3];
- } else {
- $text = $match[1];
- }
- $submatch = array();
- $thelink = null;
- if ( preg_match( '/^' . $medians . '(.*)$/i', $match[1], $submatch ) ) {
- # Media link; trail not supported.
- $linkRegexp = '/\[\[(.*?)\]\]/';
- $title = Title::makeTitleSafe( NS_FILE, $submatch[1] );
- $thelink = $this->makeMediaLinkObj( $title, $text );
+ /**
+ * Generates a link to the given Title
+ *
+ * @note This is only public for technical reasons. It's not intended for use outside Linker.
+ *
+ * @param LinkTarget $linkTarget
+ * @param string $text
+ * @param string|null $wikiId Id of the wiki to link to (if not the local wiki),
+ * as used by WikiMap.
+ * @param string|string[] $options See the $options parameter in Linker::link.
+ *
+ * @return string HTML link
+ */
+ public static function makeCommentLink(
+ LinkTarget $linkTarget, $text, $wikiId = null, $options = []
+ ) {
+ if ( $wikiId !== null && !$linkTarget->isExternal() ) {
+ $link = self::makeExternalLink(
+ WikiMap::getForeignURL(
+ $wikiId,
+ $linkTarget->getNamespace() === 0
+ ? $linkTarget->getDBkey()
+ : MWNamespace::getCanonicalName( $linkTarget->getNamespace() ) . ':'
+ . $linkTarget->getDBkey(),
+ $linkTarget->getFragment()
+ ),
+ $text,
+ /* escape = */ false // Already escaped
+ );
} else {
- # Other kind of link
- if ( preg_match( $wgContLang->linkTrail(), $match[4], $submatch ) ) {
- $trail = $submatch[1];
- } else {
- $trail = "";
- }
- $linkRegexp = '/\[\[(.*?)\]\]' . preg_quote( $trail, '/' ) . '/';
- if ( isset( $match[1][0] ) && $match[1][0] == ':' )
- $match[1] = substr( $match[1], 1 );
- list( $inside, $trail ) = Linker::splitTrail( $trail );
-
- $linkText = $text;
- $linkTarget = Linker::normalizeSubpageLink( $this->commentContextTitle,
- $match[1], $linkText );
-
- $target = Title::newFromText( $linkTarget );
- if ( $target ) {
- if ( $target->getText() == '' && $target->getInterwiki() === ''
- && !$this->commentLocal && $this->commentContextTitle )
- {
- $newTarget = clone ( $this->commentContextTitle );
- $newTarget->setFragment( '#' . $target->getFragment() );
- $target = $newTarget;
- }
- $thelink = $this->link(
- $target,
- $linkText . $inside
- ) . $trail;
- }
- }
- if ( $thelink ) {
- // If the link is still valid, go ahead and replace it in!
- $comment = preg_replace( $linkRegexp, StringUtils::escapeRegexReplacement( $thelink ), $comment, 1 );
+ $link = self::link( $linkTarget, $text, [], [], $options );
}
- return $comment;
+ return $link;
}
- static function normalizeSubpageLink( $contextTitle, $target, &$text ) {
+ /**
+ * @param Title $contextTitle
+ * @param string $target
+ * @param string &$text
+ * @return string
+ */
+ public static function normalizeSubpageLink( $contextTitle, $target, &$text ) {
# Valid link forms:
# Foobar -- normal
# :Foobar -- override special treatment of prefix (images, language links)
# /Foobar -- convert to CurrentPage/Foobar
- # /Foobar/ -- convert to CurrentPage/Foobar, strip the initial / from text
+ # /Foobar/ -- convert to CurrentPage/Foobar, strip the initial and final / from text
# ../ -- convert to CurrentPage, from CurrentPage/CurrentSubPage
- # ../Foobar -- convert to CurrentPage/Foobar, from CurrentPage/CurrentSubPage
+ # ../Foobar -- convert to CurrentPage/Foobar,
+ # (from CurrentPage/CurrentSubPage)
+ # ../Foobar/ -- convert to CurrentPage/Foobar, use 'Foobar' as text
+ # (from CurrentPage/CurrentSubPage)
- wfProfileIn( __METHOD__ );
$ret = $target; # default return value is no change
# Some namespaces don't allow subpages,
@@ -1180,12 +1380,12 @@ class Linker {
} else {
$suffix = '';
}
- # bug 7425
+ # T9425
$target = trim( $target );
# Look at the first character
- if ( $target != '' && $target { 0 } === '/' ) {
+ if ( $target != '' && $target[0] === '/' ) {
# / at end means we don't want the slash to be shown
- $m = array();
+ $m = [];
$trailingSlashes = preg_match_all( '%(/+)$%', $target, $m );
if ( $trailingSlashes ) {
$noslash = $target = substr( $target, 1, -strlen( $m[0][0] ) );
@@ -1206,12 +1406,12 @@ class Linker {
$nodotdot = substr( $nodotdot, 3 );
}
if ( $dotdotcount > 0 ) {
- $exploded = explode( '/', $contextTitle->GetPrefixedText() );
+ $exploded = explode( '/', $contextTitle->getPrefixedText() );
if ( count( $exploded ) > $dotdotcount ) { # not allowed to go below top level page
$ret = implode( '/', array_slice( $exploded, 0, -$dotdotcount ) );
# / at the end means don't show full path
if ( substr( $nodotdot, -1, 1 ) === '/' ) {
- $nodotdot = substr( $nodotdot, 0, -1 );
+ $nodotdot = rtrim( $nodotdot, '/' );
if ( $text === '' ) {
$text = $nodotdot . $suffix;
}
@@ -1226,7 +1426,6 @@ class Linker {
}
}
- wfProfileOut( __METHOD__ );
return $ret;
}
@@ -1234,21 +1433,27 @@ class Linker {
* Wrap a comment in standard punctuation and formatting if
* it's non-empty, otherwise return empty string.
*
- * @param $comment String
- * @param $title Mixed: Title object (to generate link to section in autocomment) or null
- * @param $local Boolean: whether section links should refer to local page
+ * @since 1.16.3. $wikiId added in 1.26
+ * @param string $comment
+ * @param Title|null $title Title object (to generate link to section in autocomment) or null
+ * @param bool $local Whether section links should refer to local page
+ * @param string|null $wikiId Id (as used by WikiMap) of the wiki to generate links to.
+ * For use with external changes.
*
* @return string
*/
- function commentBlock( $comment, $title = null, $local = false ) {
+ public static function commentBlock(
+ $comment, $title = null, $local = false, $wikiId = 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
+ // compatibility, acc. to brion -ævar
if ( $comment == '' || $comment == '*' ) {
return '';
} else {
- $formatted = $this->formatComment( $comment, $title, $local );
- return " ";
+ $formatted = self::formatComment( $comment, $title, $local, $wikiId );
+ $formatted = wfMessage( 'parentheses' )->rawParams( $formatted )->escaped();
+ return " ";
}
}
@@ -1256,20 +1461,23 @@ class Linker {
* Wrap and format the given revision's comment block, if the current
* user is allowed to view it.
*
- * @param $rev Revision object
- * @param $local Boolean: whether section links should refer to local page
- * @param $isPublic Boolean: show only if all users can see it
- * @return String: HTML fragment
+ * @since 1.16.3
+ * @param Revision $rev
+ * @param bool $local Whether section links should refer to local page
+ * @param bool $isPublic Show only if all users can see it
+ * @return string HTML fragment
*/
- function revComment( Revision $rev, $local = false, $isPublic = false ) {
- if ( $rev->getRawComment() == "" ) return "";
+ public static function revComment( Revision $rev, $local = false, $isPublic = false ) {
+ if ( $rev->getComment( Revision::RAW ) == "" ) {
+ return "";
+ }
if ( $rev->isDeleted( Revision::DELETED_COMMENT ) && $isPublic ) {
- $block = " ";
- } else if ( $rev->userCan( Revision::DELETED_COMMENT ) ) {
- $block = $this->commentBlock( $rev->getComment( Revision::FOR_THIS_USER ),
+ $block = " ";
+ } elseif ( $rev->userCan( Revision::DELETED_COMMENT ) ) {
+ $block = self::commentBlock( $rev->getComment( Revision::FOR_THIS_USER ),
$rev->getTitle(), $local );
} else {
- $block = " ";
+ $block = " ";
}
if ( $rev->isDeleted( Revision::DELETED_COMMENT ) ) {
return " $block";
@@ -1277,198 +1485,180 @@ class Linker {
return $block;
}
- public function formatRevisionSize( $size ) {
+ /**
+ * @since 1.16.3
+ * @param int $size
+ * @return string
+ */
+ public static function formatRevisionSize( $size ) {
if ( $size == 0 ) {
- $stxt = wfMsgExt( 'historyempty', 'parsemag' );
+ $stxt = wfMessage( 'historyempty' )->escaped();
} else {
- global $wgLang;
- $stxt = wfMsgExt( 'nbytes', 'parsemag', $wgLang->formatNum( $size ) );
- $stxt = "($stxt)";
+ $stxt = wfMessage( 'nbytes' )->numParams( $size )->escaped();
+ $stxt = wfMessage( 'parentheses' )->rawParams( $stxt )->escaped();
}
- $stxt = htmlspecialchars( $stxt );
return "$stxt";
}
/**
* Add another level to the Table of Contents
+ *
+ * @since 1.16.3
+ * @return string
*/
- function tocIndent() {
+ public static function tocIndent() {
return "\n";
}
/**
* Finish one or more sublevels on the Table of Contents
+ *
+ * @since 1.16.3
+ * @param int $level
+ * @return string
*/
- function tocUnindent( $level ) {
+ public static function tocUnindent( $level ) {
return "\n" . str_repeat( "
\n\n", $level > 0 ? $level : 0 );
}
/**
* parameter level defines if we are on an indentation level
+ *
+ * @since 1.16.3
+ * @param string $anchor
+ * @param string $tocline
+ * @param string $tocnumber
+ * @param string $level
+ * @param string|bool $sectionIndex
+ * @return string
*/
- function tocLine( $anchor, $tocline, $tocnumber, $level, $sectionIndex = false ) {
+ public static function tocLine( $anchor, $tocline, $tocnumber, $level, $sectionIndex = false ) {
$classes = "toclevel-$level";
- if ( $sectionIndex !== false )
+ if ( $sectionIndex !== false ) {
$classes .= " tocsection-$sectionIndex";
- return "\n' .
- $tocnumber . ' ' .
- $tocline . '';
+ }
+
+ // \n
+ // $tocnumber $tocline
+ return "\n" . Html::openElement( 'li', [ 'class' => $classes ] )
+ . Html::rawElement( 'a',
+ [ 'href' => "#$anchor" ],
+ Html::element( 'span', [ 'class' => 'tocnumber' ], $tocnumber )
+ . ' '
+ . Html::rawElement( 'span', [ 'class' => 'toctext' ], $tocline )
+ );
}
/**
* End a Table Of Contents line.
* tocUnindent() will be used instead if we're ending a line below
* the new level.
+ * @since 1.16.3
+ * @return string
*/
- function tocLineEnd() {
+ public static function tocLineEnd() {
return "\n";
}
/**
* Wraps the TOC in a table and provides the hide/collapse javascript.
*
- * @param $toc String: html of the Table Of Contents
- * @param $lang mixed: Language code for the toc title
- * @return String: full html of the TOC
+ * @since 1.16.3
+ * @param string $toc Html of the Table Of Contents
+ * @param string|Language|bool $lang Language for the toc title, defaults to user language
+ * @return string Full html of the TOC
*/
- function tocList( $toc, $lang = false ) {
- $title = wfMsgExt( 'toc', array( 'language' => $lang, 'escape' ) );
- return
- ''
- . '' . $title . "\n"
- . $toc
- . "\n |
\n";
+ public static function tocList( $toc, $lang = false ) {
+ $lang = wfGetLangObj( $lang );
+ $title = wfMessage( 'toc' )->inLanguage( $lang )->escaped();
+
+ return ''
+ . '
' . $title . "
\n"
+ . $toc
+ . "\n
';
- if ( $preview ) {
- $outText .= wfMsgExt( 'templatesusedpreview', array( 'parse' ), count( $templates ) );
- } elseif ( $section ) {
- $outText .= wfMsgExt( 'templatesusedsection', array( 'parse' ), count( $templates ) );
- } else {
- $outText .= wfMsgExt( 'templatesused', array( 'parse' ), count( $templates ) );
- }
- $outText .= "
\n";
+ $type = false;
+ if ( $preview ) {
+ $type = 'preview';
+ } elseif ( $section ) {
+ $type = 'section';
+ }
- usort( $templates, array( 'Title', 'compare' ) );
- foreach ( $templates as $titleObj ) {
- $r = $titleObj->getRestrictions( 'edit' );
- if ( in_array( 'sysop', $r ) ) {
- $protected = wfMsgExt( 'template-protected', array( 'parseinline' ) );
- } elseif ( in_array( 'autoconfirmed', $r ) ) {
- $protected = wfMsgExt( 'template-semiprotected', array( 'parseinline' ) );
- } else {
- $protected = '';
- }
- if ( $titleObj->quickUserCan( 'edit' ) ) {
- $editLink = $this->link(
- $titleObj,
- wfMsg( 'editlink' ),
- array(),
- array( 'action' => 'edit' )
- );
- } else {
- $editLink = $this->link(
- $titleObj,
- wfMsg( 'viewsourcelink' ),
- array(),
- array( 'action' => 'edit' )
- );
- }
- $outText .= '- ' . $this->link( $titleObj ) . ' (' . $editLink . ') ' . $protected . '
';
- }
- $outText .= '
';
+ if ( $more instanceof Message ) {
+ $more = $more->toString();
}
- wfProfileOut( __METHOD__ );
- return $outText;
+
+ $formatter = new TemplatesOnThisPageFormatter(
+ RequestContext::getMain(),
+ MediaWikiServices::getInstance()->getLinkRenderer()
+ );
+ return $formatter->format( $templates, $type, $more );
}
/**
* Returns HTML for the "hidden categories on this page" list.
*
- * @param $hiddencats Array of hidden categories from Article::getHiddenCategories
- * or similar
- * @return String: HTML output
+ * @since 1.16.3
+ * @param array $hiddencats Array of hidden categories from Article::getHiddenCategories
+ * or similar
+ * @return string HTML output
*/
- public function formatHiddenCategories( $hiddencats ) {
- global $wgLang;
- wfProfileIn( __METHOD__ );
-
+ public static function formatHiddenCategories( $hiddencats ) {
$outText = '';
if ( count( $hiddencats ) > 0 ) {
# Construct the HTML
$outText = '';
- $outText .= wfMsgExt( 'hiddencategories', array( 'parse' ), $wgLang->formatnum( count( $hiddencats ) ) );
+ $outText .= wfMessage( 'hiddencategories' )->numParams( count( $hiddencats ) )->parseAsBlock();
$outText .= "
\n";
foreach ( $hiddencats as $titleObj ) {
- $outText .= '- ' . $this->link( $titleObj, null, array(), array(), 'known' ) . "
\n"; # If it's hidden, it must exist - no need to check with a LinkBatch
+ # If it's hidden, it must exist - no need to check with a LinkBatch
+ $outText .= '- '
+ . self::link( $titleObj, null, [], [], 'known' )
+ . "
\n";
}
$outText .= '
';
}
- wfProfileOut( __METHOD__ );
return $outText;
}
/**
+ * @deprecated since 1.28, use Language::formatSize() directly
+ *
* Format a size in bytes for output, using an appropriate
* unit (B, KB, MB or GB) according to the magnitude in question
*
- * @param $size Size to format
- * @return String
+ * @since 1.16.3
+ * @param int $size Size to format
+ * @return string
*/
- public function formatSize( $size ) {
+ public static function formatSize( $size ) {
+ wfDeprecated( __METHOD__, '1.28' );
+
global $wgLang;
return htmlspecialchars( $wgLang->formatSize( $size ) );
}
@@ -1624,57 +1939,62 @@ class Linker {
* isn't always, because sometimes the accesskey needs to go on a different
* element than the id, for reverse-compatibility, etc.)
*
- * @param $name String: id of the element, minus prefixes.
- * @param $options Mixed: null or the string 'withaccess' to add an access-
+ * @since 1.16.3 $msgParams added in 1.27
+ * @param string $name Id of the element, minus prefixes.
+ * @param string|null $options Null or the string 'withaccess' to add an access-
* key hint
- * @return String: contents of the title attribute (which you must HTML-
+ * @param array $msgParams Parameters to pass to the message
+ *
+ * @return string Contents of the title attribute (which you must HTML-
* escape), or false for no title attribute
*/
- public function titleAttrib( $name, $options = null ) {
- wfProfileIn( __METHOD__ );
-
- if ( wfEmptyMsg( "tooltip-$name" ) ) {
+ public static function titleAttrib( $name, $options = null, array $msgParams = [] ) {
+ $message = wfMessage( "tooltip-$name", $msgParams );
+ if ( !$message->exists() ) {
$tooltip = false;
} else {
- $tooltip = wfMsg( "tooltip-$name" );
+ $tooltip = $message->text();
# Compatibility: formerly some tooltips had [alt-.] hardcoded
$tooltip = preg_replace( "/ ?\[alt-.\]$/", '', $tooltip );
# Message equal to '-' means suppress it.
- if ( $tooltip == '-' ) {
+ if ( $tooltip == '-' ) {
$tooltip = false;
}
}
if ( $options == 'withaccess' ) {
- $accesskey = $this->accesskey( $name );
+ $accesskey = self::accesskey( $name );
if ( $accesskey !== false ) {
+ // Should be build the same as in jquery.accessKeyLabel.js
if ( $tooltip === false || $tooltip === '' ) {
- $tooltip = "[$accesskey]";
+ $tooltip = wfMessage( 'brackets', $accesskey )->text();
} else {
- $tooltip .= " [$accesskey]";
+ $tooltip .= wfMessage( 'word-separator' )->text();
+ $tooltip .= wfMessage( 'brackets', $accesskey )->text();
}
}
}
- wfProfileOut( __METHOD__ );
return $tooltip;
}
+ public static $accesskeycache;
+
/**
* Given the id of an interface element, constructs the appropriate
* accesskey attribute from the system messages. (Note, this is usually
* the id but isn't always, because sometimes the accesskey needs to go on
* a different element than the id, for reverse-compatibility, etc.)
*
- * @param $name String: id of the element, minus prefixes.
- * @return String: contents of the accesskey attribute (which you must HTML-
+ * @since 1.16.3
+ * @param string $name Id of the element, minus prefixes.
+ * @return string Contents of the accesskey attribute (which you must HTML-
* escape), or false for no accesskey attribute
*/
- public function accesskey( $name ) {
- if ( isset( $this->accesskeycache[$name] ) ) {
- return $this->accesskeycache[$name];
+ public static function accesskey( $name ) {
+ if ( isset( self::$accesskeycache[$name] ) ) {
+ return self::$accesskeycache[$name];
}
- wfProfileIn( __METHOD__ );
$message = wfMessage( "accesskey-$name" );
@@ -1683,388 +2003,116 @@ class Linker {
} else {
$accesskey = $message->plain();
if ( $accesskey === '' || $accesskey === '-' ) {
- # FIXME: Per standard MW behavior, a value of '-' means to suppress the
+ # @todo FIXME: Per standard MW behavior, a value of '-' means to suppress the
# attribute, but this is broken for accesskey: that might be a useful
# value.
$accesskey = false;
}
}
- wfProfileOut( __METHOD__ );
- return $this->accesskeycache[$name] = $accesskey;
+ self::$accesskeycache[$name] = $accesskey;
+ return self::$accesskeycache[$name];
}
/**
- * Creates a (show/hide) link for deleting revisions/log entries
+ * Get a revision-deletion link, or disabled link, or nothing, depending
+ * on user permissions & the settings on the revision.
*
- * @param $query Array: query parameters to be passed to link()
- * @param $restricted Boolean: set to true to use a instead of a
- * @param $delete Boolean: set to true to use (show/hide) rather than (show)
+ * Will use forward-compatible revision ID in the Special:RevDelete link
+ * if possible, otherwise the timestamp-based ID which may break after
+ * undeletion.
*
- * @return String: HTML link to Special:Revisiondelete, wrapped in a
- * span to allow for customization of appearance with CSS
- */
- public function revDeleteLink( $query = array(), $restricted = false, $delete = true ) {
- $sp = SpecialPage::getTitleFor( 'Revisiondelete' );
- $text = $delete ? wfMsgHtml( 'rev-delundel' ) : wfMsgHtml( 'rev-showdeleted' );
- $tag = $restricted ? 'strong' : 'span';
- $link = $this->link( $sp, $text, array(), $query, array( 'known', 'noclasses' ) );
- return Xml::tags( $tag, array( 'class' => 'mw-revdelundel-link' ), "($link)" );
- }
-
- /**
- * Creates a dead (show/hide) link for deleting revisions/log entries
- *
- * @param $delete Boolean: set to true to use (show/hide) rather than (show)
- *
- * @return string HTML text wrapped in a span to allow for customization
- * of appearance with CSS
- */
- public function revDeleteLinkDisabled( $delete = true ) {
- $text = $delete ? wfMsgHtml( 'rev-delundel' ) : wfMsgHtml( 'rev-showdeleted' );
- return Xml::tags( 'span', array( 'class' => 'mw-revdelundel-link' ), "($text)" );
- }
-
- /* Deprecated methods */
-
- /**
- * @deprecated
- */
- function postParseLinkColour( $s = null ) {
- wfDeprecated( __METHOD__ );
- return null;
- }
-
-
- /**
- * @deprecated Use link()
- *
- * 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( __METHOD__ );
- $nt = Title::newFromText( $title );
- if ( $nt instanceof Title ) {
- $result = $this->makeLinkObj( $nt, $text, $query, $trail );
- } else {
- wfDebug( 'Invalid title passed to Linker::makeLink(): "' . $title . "\"\n" );
- $result = $text == "" ? $title : $text;
- }
-
- wfProfileOut( __METHOD__ );
- return $result;
- }
-
- /**
- * @deprecated Use link()
- *
- * 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.
- * @param $prefix String: Optional prefix
- * @param $aprops String: extra attributes to the a-element
- */
- function makeKnownLink( $title, $text = '', $query = '', $trail = '', $prefix = '', $aprops = '' ) {
- $nt = Title::newFromText( $title );
- if ( $nt instanceof Title ) {
- return $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix , $aprops );
- } else {
- wfDebug( 'Invalid title passed to Linker::makeKnownLink(): "' . $title . "\"\n" );
- return $text == '' ? $title : $text;
+ * @param User $user
+ * @param Revision $rev
+ * @param Title $title
+ * @return string HTML fragment
+ */
+ public static function getRevDeleteLink( User $user, Revision $rev, Title $title ) {
+ $canHide = $user->isAllowed( 'deleterevision' );
+ if ( !$canHide && !( $rev->getVisibility() && $user->isAllowed( 'deletedhistory' ) ) ) {
+ return '';
}
- }
- /**
- * @deprecated Use link()
- *
- * 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 $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 makeBrokenLink( $title, $text = '', $query = '', $trail = '' ) {
- $nt = Title::newFromText( $title );
- if ( $nt instanceof Title ) {
- return $this->makeBrokenLinkObj( $nt, $text, $query, $trail );
+ if ( !$rev->userCan( Revision::DELETED_RESTRICTED, $user ) ) {
+ return self::revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
} else {
- wfDebug( 'Invalid title passed to Linker::makeBrokenLink(): "' . $title . "\"\n" );
- return $text == '' ? $title : $text;
+ if ( $rev->getId() ) {
+ // RevDelete links using revision ID are stable across
+ // page deletion and undeletion; use when possible.
+ $query = [
+ 'type' => 'revision',
+ 'target' => $title->getPrefixedDBkey(),
+ 'ids' => $rev->getId()
+ ];
+ } else {
+ // Older deleted entries didn't save a revision ID.
+ // We have to refer to these by timestamp, ick!
+ $query = [
+ 'type' => 'archive',
+ 'target' => $title->getPrefixedDBkey(),
+ 'ids' => $rev->getTimestamp()
+ ];
+ }
+ return self::revDeleteLink( $query,
+ $rev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
}
}
/**
- * @deprecated Use link()
+ * Creates a (show/hide) link for deleting revisions/log entries
*
- * 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 array $query Query parameters to be passed to link()
+ * @param bool $restricted Set to true to use a "" instead of a ""
+ * @param bool $delete Set to true to use (show/hide) rather than (show)
*
- * @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 = '' ) {
- wfDeprecated( __METHOD__ );
- $nt = Title::newFromText( $title );
- if ( $nt instanceof Title ) {
- return $this->makeStubLinkObj( $nt, $text, $query, $trail );
- } else {
- wfDebug( 'Invalid title passed to Linker::makeStubLink(): "' . $title . "\"\n" );
- return $text == '' ? $title : $text;
- }
- }
-
- /**
- * @deprecated Use link()
- *
- * 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 $nt Title: the title object to make the link from, e.g. from
- * Title::newFromText.
- * @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.
- * @param $prefix String: optional prefix. As trail, only before instead of after.
- */
- function makeLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
- wfProfileIn( __METHOD__ );
-
- $query = wfCgiToArray( $query );
- list( $inside, $trail ) = Linker::splitTrail( $trail );
- if ( $text === '' ) {
- $text = $this->linkText( $nt );
- }
-
- $ret = $this->link( $nt, "$prefix$text$inside", array(), $query ) . $trail;
-
- wfProfileOut( __METHOD__ );
- return $ret;
- }
-
- /**
- * @deprecated Use link()
- *
- * 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 $title 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
+ * @return string HTML "" link to Special:Revisiondelete, wrapped in a
+ * span to allow for customization of appearance with CSS
*/
- function makeKnownLinkObj( $title, $text = '', $query = '', $trail = '', $prefix = '' , $aprops = '', $style = '' ) {
- wfProfileIn( __METHOD__ );
-
- if ( $text == '' ) {
- $text = $this->linkText( $title );
- }
- $attribs = Sanitizer::mergeAttributes(
- Sanitizer::decodeTagAttributes( $aprops ),
- Sanitizer::decodeTagAttributes( $style )
+ public static function revDeleteLink( $query = [], $restricted = false, $delete = true ) {
+ $sp = SpecialPage::getTitleFor( 'Revisiondelete' );
+ $msgKey = $delete ? 'rev-delundel' : 'rev-showdeleted';
+ $html = wfMessage( $msgKey )->escaped();
+ $tag = $restricted ? 'strong' : 'span';
+ $link = self::link( $sp, $html, [], $query, [ 'known', 'noclasses' ] );
+ return Xml::tags(
+ $tag,
+ [ 'class' => 'mw-revdelundel-link' ],
+ wfMessage( 'parentheses' )->rawParams( $link )->escaped()
);
- $query = wfCgiToArray( $query );
- list( $inside, $trail ) = Linker::splitTrail( $trail );
-
- $ret = $this->link( $title, "$prefix$text$inside", $attribs, $query,
- array( 'known', 'noclasses' ) ) . $trail;
-
- wfProfileOut( __METHOD__ );
- return $ret;
}
/**
- * @deprecated Use link()
- *
- * Make a red link to the edit page of a given title.
- *
- * @param $title Title object of the target page
- * @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.
- * @param $prefix String: Optional prefix
- */
- function makeBrokenLinkObj( $title, $text = '', $query = '', $trail = '', $prefix = '' ) {
- wfProfileIn( __METHOD__ );
-
- list( $inside, $trail ) = Linker::splitTrail( $trail );
- if ( $text === '' ) {
- $text = $this->linkText( $title );
- }
-
- $ret = $this->link( $title, "$prefix$text$inside", array(),
- wfCgiToArray( $query ), 'broken' ) . $trail;
-
- wfProfileOut( __METHOD__ );
- return $ret;
- }
-
- /**
- * @deprecated Use link()
- *
- * Make a brown link to a short article.
+ * Creates a dead (show/hide) link for deleting revisions/log entries
*
- * @param $nt Title object of the target page
- * @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.
- * @param $prefix String: Optional prefix
- */
- function makeStubLinkObj( $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
- // wfDeprecated( __METHOD__ );
- return $this->makeColouredLinkObj( $nt, 'stub', $text, $query, $trail, $prefix );
- }
-
- /**
- * @deprecated Use link()
- *
- * Make a coloured link.
- *
- * @param $nt Title object of the target page
- * @param $colour Integer: colour of the link
- * @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.
- * @param $prefix String: Optional prefix
- */
- function makeColouredLinkObj( $nt, $colour, $text = '', $query = '', $trail = '', $prefix = '' ) {
- // wfDeprecated( __METHOD__ );
- if ( $colour != '' ) {
- $style = $this->getInternalLinkAttributesObj( $nt, $text, $colour );
- } else $style = '';
- return $this->makeKnownLinkObj( $nt, $text, $query, $trail, $prefix, '', $style );
- }
-
- /** Obsolete alias */
- function makeImage( $url, $alt = '' ) {
- wfDeprecated( __METHOD__ );
- return $this->makeExternalImage( $url, $alt );
- }
-
- /**
- * Creates the HTML source for images
- * @deprecated use makeImageLink2
- *
- * @param $title Title object
- * @param $label String: label text
- * @param $alt String: alt text
- * @param $align String: horizontal alignment: none, left, center, right)
- * @param $handlerParams Array: parameters to be passed to the media handler
- * @param $framed Boolean: shows image in original size in a frame
- * @param $thumb Boolean: shows image as thumbnail in a frame
- * @param $manualthumb String: image name for the manual thumbnail
- * @param $valign String: vertical alignment: baseline, sub, super, top, text-top, middle, bottom, text-bottom
- * @param $time String: timestamp of the file, set as false for current
- * @return String
- */
- function makeImageLinkObj( $title, $label, $alt, $align = '', $handlerParams = array(), $framed = false,
- $thumb = false, $manualthumb = '', $valign = '', $time = false )
- {
- $frameParams = array( 'alt' => $alt, 'caption' => $label );
- if ( $align ) {
- $frameParams['align'] = $align;
- }
- if ( $framed ) {
- $frameParams['framed'] = true;
- }
- if ( $thumb ) {
- $frameParams['thumbnail'] = true;
- }
- if ( $manualthumb ) {
- $frameParams['manualthumb'] = $manualthumb;
- }
- if ( $valign ) {
- $frameParams['valign'] = $valign;
- }
- $file = wfFindFile( $title, array( 'time' => $time ) );
- return $this->makeImageLink2( $title, $file, $frameParams, $handlerParams, $time );
- }
-
- /** @deprecated use Linker::makeMediaLinkObj() */
- function makeMediaLink( $name, $unused = '', $text = '', $time = false ) {
- $nt = Title::makeTitleSafe( NS_FILE, $name );
- return $this->makeMediaLinkObj( $nt, $text, $time );
- }
-
- /**
- * Used to generate section edit links that point to "other" pages
- * (sections that are really part of included pages).
+ * @since 1.16.3
+ * @param bool $delete Set to true to use (show/hide) rather than (show)
*
- * @deprecated use Linker::doEditSectionLink()
- * @param $title Title string.
- * @param $section Integer: section number.
+ * @return string HTML text wrapped in a span to allow for customization
+ * of appearance with CSS
*/
- public function editSectionLinkForOther( $title, $section ) {
- wfDeprecated( __METHOD__ );
- $title = Title::newFromText( $title );
- return $this->doEditSectionLink( $title, $section );
+ public static function revDeleteLinkDisabled( $delete = true ) {
+ $msgKey = $delete ? 'rev-delundel' : 'rev-showdeleted';
+ $html = wfMessage( $msgKey )->escaped();
+ $htmlParentheses = wfMessage( 'parentheses' )->rawParams( $html )->escaped();
+ return Xml::tags( 'span', [ 'class' => 'mw-revdelundel-link' ], $htmlParentheses );
}
- /**
- * @deprecated use Linker::doEditSectionLink()
- * @param $nt Title object.
- * @param $section Integer: section number.
- * @param $hint Link String: title, or default if omitted or empty
- */
- public function editSectionLink( Title $nt, $section, $hint = '' ) {
- wfDeprecated( __METHOD__ );
- if ( $hint === '' ) {
- # No way to pass an actual empty $hint here! The new interface al-
- # lows this, so we have to do this for compatibility.
- $hint = null;
- }
- return $this->doEditSectionLink( $nt, $section, $hint );
- }
+ /* Deprecated methods */
/**
* Returns the attributes for the tooltip and access key.
+ *
+ * @since 1.16.3. $msgParams introduced in 1.27
+ * @param string $name
+ * @param array $msgParams Params for constructing the message
+ *
+ * @return array
*/
- public function tooltipAndAccesskeyAttribs( $name ) {
- global $wgEnableTooltipsAndAccesskeys;
- if ( !$wgEnableTooltipsAndAccesskeys )
- return array();
- # FIXME: If Sanitizer::expandAttributes() treated "false" as "output
- # no attribute" instead of "output '' as value for attribute", this
- # would be three lines.
- $attribs = array(
- 'title' => $this->titleAttrib( $name, 'withaccess' ),
- 'accesskey' => $this->accesskey( $name )
- );
+ public static function tooltipAndAccesskeyAttribs( $name, array $msgParams = [] ) {
+ $attribs = [
+ 'title' => self::titleAttrib( $name, 'withaccess', $msgParams ),
+ 'accesskey' => self::accesskey( $name )
+ ];
if ( $attribs['title'] === false ) {
unset( $attribs['title'] );
}
@@ -2073,27 +2121,22 @@ class Linker {
}
return $attribs;
}
+
/**
- * @deprecated Returns raw bits of HTML, use titleAttrib() and accesskey()
+ * Returns raw bits of HTML, use titleAttrib()
+ * @since 1.16.3
+ * @param string $name
+ * @param array|null $options
+ * @return null|string
*/
- public function tooltipAndAccesskey( $name ) {
- return Xml::expandAttributes( $this->tooltipAndAccesskeyAttribs( $name ) );
- }
-
- /** @deprecated Returns raw bits of HTML, use titleAttrib() */
- public function tooltip( $name, $options = null ) {
- global $wgEnableTooltipsAndAccesskeys;
- if ( !$wgEnableTooltipsAndAccesskeys )
- return '';
- # FIXME: If Sanitizer::expandAttributes() treated "false" as "output
- # no attribute" instead of "output '' as value for attribute", this
- # would be two lines.
- $tooltip = $this->titleAttrib( $name, $options );
+ public static function tooltip( $name, $options = null ) {
+ $tooltip = self::titleAttrib( $name, $options );
if ( $tooltip === false ) {
return '';
}
- return Xml::expandAttributes( array(
- 'title' => $this->titleAttrib( $name, $options )
- ) );
+ return Xml::expandAttributes( [
+ 'title' => $tooltip
+ ] );
}
+
}
 . '/common/images/magnify-clip.png)