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 "Revert "Title::checkUserBlock should call User::isBlockedFrom for every action""
[lhc/web/wiklou.git]
/
includes
/
parser
/
CoreParserFunctions.php
diff --git
a/includes/parser/CoreParserFunctions.php
b/includes/parser/CoreParserFunctions.php
index
1f5308f
..
8ab5c31
100644
(file)
--- a/
includes/parser/CoreParserFunctions.php
+++ b/
includes/parser/CoreParserFunctions.php
@@
-98,11
+98,6
@@
class CoreParserFunctions {
$args = array_slice( func_get_args(), 2 );
$message = wfMessage( $part1, $args )
->inLanguage( $parser->getOptions()->getUserLangObj() );
$args = array_slice( func_get_args(), 2 );
$message = wfMessage( $part1, $args )
->inLanguage( $parser->getOptions()->getUserLangObj() );
- if ( !$message->exists() ) {
- // When message does not exists, the message name is surrounded by angle
- // and can result in a tag, therefore escape the angles
- return $message->escaped();
- }
return [ $message->plain(), 'noparse' => false ];
} else {
return [ 'found' => false ];
return [ $message->plain(), 'noparse' => false ];
} else {
return [ 'found' => false ];
@@
-460,11
+455,10
@@
class CoreParserFunctions {
return '';
}
} else {
return '';
}
} else {
- $converter = $parser->getTargetLanguage()->getConverter();
$parser->getOutput()->addWarning(
wfMessage( 'restricted-displaytitle',
// Message should be parsed, but this param should only be escaped.
$parser->getOutput()->addWarning(
wfMessage( 'restricted-displaytitle',
// Message should be parsed, but this param should only be escaped.
-
$converter->markNoConversion( wfEscapeWikiText( $text )
)
+
wfEscapeWikiText( $text
)
)->text()
);
$parser->addTrackingCategory( 'restricted-displaytitle-ignored' );
)->text()
);
$parser->addTrackingCategory( 'restricted-displaytitle-ignored' );