*/
private static function fnamePart( $url ) {
$basename = strrchr( $url, '/' );
- if ( false === $basename ) {
+ if ( $basename === false ) {
$basename = $url;
} else {
$basename = substr( $basename, 1 );
$prefix = $postfix = '';
- if ( 'center' == $frameParams['align'] ) {
+ if ( $frameParams['align'] == 'center' ) {
$prefix = '<div class="center">';
$postfix = '</div>';
$frameParams['align'] = 'none';
$userId, $userText, $redContribsWhenNoEdits = false, $flags = 0, $edits = null
) {
global $wgUser, $wgDisableAnonTalk, $wgLang;
- $talkable = !( $wgDisableAnonTalk && 0 == $userId );
+ $talkable = !( $wgDisableAnonTalk && $userId == 0 );
$blockable = !( $flags & self::TOOL_LINKS_NOBLOCK );
$addEmailLink = $flags & self::TOOL_LINKS_EMAIL && $userId;
);
if ( $comment === null ) {
- $link = '';
if ( $title ) {
$section = $auto;
# Remove links that a user may have manually put in the autosummary
$section = str_replace( '[[', '', $section );
$section = str_replace( ']]', '', $section );
+ // We don't want any links in the auto text to be linked, but we still
+ // want to show any [[ ]]
+ $sectionText = str_replace( '[[', '[[', $auto );
+
$section = substr( Parser::guessSectionNameFromStrippedText( $section ), 1 );
if ( $local ) {
$sectionTitle = Title::makeTitleSafe( NS_MAIN, '', $section );
$title->getDBkey(), $section );
}
if ( $sectionTitle ) {
- $link = Linker::makeCommentLink(
- $sectionTitle, $wgLang->getArrow() . $auto, $wikiId, 'noclasses'
+ $auto = Linker::makeCommentLink(
+ $sectionTitle, $wgLang->getArrow() . $wgLang->getDirMark() . $sectionText,
+ $wikiId, 'noclasses'
);
- $auto = '';
- } else {
- $link = '';
}
}
if ( $pre ) {
$auto = '<span dir="auto"><span class="autocomment">' . $auto . '</span>';
$append .= '</span>';
}
- $comment = $pre . $link . $wgLang->getDirMark() . $auto;
+ $comment = $pre . $auto;
}
return $comment;
},
*
* @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
+ * @param string|Language|bool|null $lang Language for the toc title, defaults to user language.
+ * The types string and bool are deprecated.
* @return string Full html of the TOC
*/
- public static function tocList( $toc, $lang = false ) {
- $lang = wfGetLangObj( $lang );
+ public static function tocList( $toc, $lang = null ) {
+ global $wgLang;
+ $lang = $lang ?? $wgLang;
+ if ( !is_object( $lang ) ) {
+ wfDeprecated( __METHOD__ . ' with type other than Language for $lang', '1.33' );
+ $lang = wfGetLangObj( $lang );
+ }
+
$title = wfMessage( 'toc' )->inLanguage( $lang )->escaped();
return '<div id="toc" class="toc">'
*
* @since 1.16.3. $lang added in 1.17
* @param array $tree Return value of ParserOutput::getSections()
- * @param string|Language|bool $lang Language for the toc title, defaults to user language
+ * @param string|Language|bool|null $lang Language for the toc title, defaults to user language.
+ * The types string and bool are deprecated.
* @return string HTML fragment
*/
- public static function generateTOC( $tree, $lang = false ) {
+ public static function generateTOC( $tree, $lang = null ) {
$toc = '';
$lastLevel = 0;
foreach ( $tree as $section ) {