dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Move section ID fallbacks into headers themselves"
[lhc/web/wiklou.git]
/
includes
/
parser
/
Parser.php
diff --git
a/includes/parser/Parser.php
b/includes/parser/Parser.php
index
3261002
..
57e627e
100644
(file)
--- a/
includes/parser/Parser.php
+++ b/
includes/parser/Parser.php
@@
-736,17
+736,6
@@
class Parser {
return $text;
}
return $text;
}
- /**
- * Get a random string
- *
- * @return string
- * @deprecated since 1.26; use wfRandomString() instead.
- */
- public static function getRandomString() {
- wfDeprecated( __METHOD__, '1.26' );
- return wfRandomString( 16 );
- }
-
/**
* Set the current user.
* Should only be used when doing pre-save transform.
/**
* Set the current user.
* Should only be used when doing pre-save transform.
@@
-757,17
+746,6
@@
class Parser {
$this->mUser = $user;
}
$this->mUser = $user;
}
- /**
- * Accessor for mUniqPrefix.
- *
- * @return string
- * @deprecated since 1.26; use Parser::MARKER_PREFIX instead.
- */
- public function uniqPrefix() {
- wfDeprecated( __METHOD__, '1.26' );
- return self::MARKER_PREFIX;
- }
-
/**
* Set the context title
*
/**
* Set the context title
*
@@
-973,14
+951,9
@@
class Parser {
* @param array $elements List of element names. Comments are always extracted.
* @param string $text Source text string.
* @param array &$matches Out parameter, Array: extracted tags
* @param array $elements List of element names. Comments are always extracted.
* @param string $text Source text string.
* @param array &$matches Out parameter, Array: extracted tags
- * @param string|null $uniq_prefix
* @return string Stripped text
* @return string Stripped text
- * @since 1.26 The uniq_prefix argument is deprecated.
*/
*/
- public static function extractTagsAndParams( $elements, $text, &$matches, $uniq_prefix = null ) {
- if ( $uniq_prefix !== null ) {
- wfDeprecated( __METHOD__ . ' called with $prefix argument', '1.26' );
- }
+ public static function extractTagsAndParams( $elements, $text, &$matches ) {
static $n = 1;
$stripped = '';
$matches = [];
static $n = 1;
$stripped = '';
$matches = [];
@@
-2323,8
+2296,11
@@
class Parser {
$this->mOutput->addLanguageLink( $nt->getFullText() );
}
$this->mOutput->addLanguageLink( $nt->getFullText() );
}
+ /**
+ * Strip the whitespace interwiki links produce, see T10897
+ */
$s = rtrim( $s . $prefix );
$s = rtrim( $s . $prefix );
- $s .=
trim( $trail, "\n" ) == '' ? '' : $prefix . $trail
;
+ $s .=
rtrim( $trail, "\n" )
;
continue;
}
continue;
}
@@
-2349,7
+2325,11
@@
class Parser {
continue;
}
} elseif ( $ns == NS_CATEGORY ) {
continue;
}
} elseif ( $ns == NS_CATEGORY ) {
- $s = rtrim( $s . "\n" ); # T2087
+ /**
+ * Strip the whitespace Category links produce, see T2087
+ */
+ $s = rtrim( $s . $prefix ); # T2087, T87753
+ $s .= rtrim( $trail, "\n" );
if ( $wasblank ) {
$sortkey = $this->getDefaultSort();
if ( $wasblank ) {
$sortkey = $this->getDefaultSort();
@@
-2361,11
+2341,6
@@
class Parser {
$sortkey = $this->getConverterLanguage()->convertCategoryKey( $sortkey );
$this->mOutput->addCategory( $nt->getDBkey(), $sortkey );
$sortkey = $this->getConverterLanguage()->convertCategoryKey( $sortkey );
$this->mOutput->addCategory( $nt->getDBkey(), $sortkey );
- /**
- * Strip the whitespace Category links produce, see T2087
- */
- $s .= trim( $prefix . $trail, "\n" ) == '' ? '' : $prefix . $trail;
-
continue;
}
}
continue;
}
}
@@
-2611,7
+2586,7
@@
class Parser {
) ) );
break;
case 'talkpagename':
) ) );
break;
case 'talkpagename':
- if ( $this->mTitle->can
Talk
() ) {
+ if ( $this->mTitle->can
HaveTalkPage
() ) {
$talkPage = $this->mTitle->getTalkPage();
$value = wfEscapeWikiText( $talkPage->getPrefixedText() );
} else {
$talkPage = $this->mTitle->getTalkPage();
$value = wfEscapeWikiText( $talkPage->getPrefixedText() );
} else {
@@
-2619,7
+2594,7
@@
class Parser {
}
break;
case 'talkpagenamee':
}
break;
case 'talkpagenamee':
- if ( $this->mTitle->can
Talk
() ) {
+ if ( $this->mTitle->can
HaveTalkPage
() ) {
$talkPage = $this->mTitle->getTalkPage();
$value = wfEscapeWikiText( $talkPage->getPrefixedURL() );
} else {
$talkPage = $this->mTitle->getTalkPage();
$value = wfEscapeWikiText( $talkPage->getPrefixedURL() );
} else {
@@
-2719,12
+2694,12
@@
class Parser {
$value = $this->mTitle->getNamespace();
break;
case 'talkspace':
$value = $this->mTitle->getNamespace();
break;
case 'talkspace':
- $value = $this->mTitle->can
Talk
()
+ $value = $this->mTitle->can
HaveTalkPage
()
? str_replace( '_', ' ', $this->mTitle->getTalkNsText() )
: '';
break;
case 'talkspacee':
? str_replace( '_', ' ', $this->mTitle->getTalkNsText() )
: '';
break;
case 'talkspacee':
- $value = $this->mTitle->can
Talk
() ? wfUrlencode( $this->mTitle->getTalkNsText() ) : '';
+ $value = $this->mTitle->can
HaveTalkPage
() ? wfUrlencode( $this->mTitle->getTalkNsText() ) : '';
break;
case 'subjectspace':
$value = str_replace( '_', ' ', $this->mTitle->getSubjectNsText() );
break;
case 'subjectspace':
$value = str_replace( '_', ' ', $this->mTitle->getSubjectNsText() );