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
resourceloader: Backport jquery-migrate.js patch for exceptionHook
[lhc/web/wiklou.git]
/
includes
/
content
/
ContentHandler.php
diff --git
a/includes/content/ContentHandler.php
b/includes/content/ContentHandler.php
index
ed5be47
..
85894ed
100644
(file)
--- a/
includes/content/ContentHandler.php
+++ b/
includes/content/ContentHandler.php
@@
-1007,22
+1007,22
@@
abstract class ContentHandler {
* @return ParserOptions
*/
public function makeParserOptions( $context ) {
* @return ParserOptions
*/
public function makeParserOptions( $context ) {
- global $wgContLang
, $wgEnableParserLimitReporting
;
+ global $wgContLang;
if ( $context instanceof IContextSource ) {
if ( $context instanceof IContextSource ) {
- $options = ParserOptions::newFromContext( $context );
+ $user = $context->getUser();
+ $lang = $context->getLanguage();
} elseif ( $context instanceof User ) { // settings per user (even anons)
} elseif ( $context instanceof User ) { // settings per user (even anons)
- $options = ParserOptions::newFromUser( $context );
+ $user = $context;
+ $lang = null;
} elseif ( $context === 'canonical' ) { // canonical settings
} elseif ( $context === 'canonical' ) { // canonical settings
- $options = ParserOptions::newFromUserAndLang( new User, $wgContLang );
+ $user = new User;
+ $lang = $wgContLang;
} else {
throw new MWException( "Bad context for parser options: $context" );
}
} else {
throw new MWException( "Bad context for parser options: $context" );
}
- $options->enableLimitReport( $wgEnableParserLimitReporting ); // show inclusion/loop reports
- $options->setTidy( true ); // fix bad HTML
-
- return $options;
+ return ParserOptions::newCanonical( $user, $lang );
}
/**
}
/**
@@
-1157,8
+1157,11
@@
abstract class ContentHandler {
* @return array Map of name=>value for fields
* @since 1.28
*/
* @return array Map of name=>value for fields
* @since 1.28
*/
- public function getDataForSearchIndex( WikiPage $page, ParserOutput $output,
- SearchEngine $engine ) {
+ public function getDataForSearchIndex(
+ WikiPage $page,
+ ParserOutput $output,
+ SearchEngine $engine
+ ) {
$fieldData = [];
$content = $page->getContent();
$fieldData = [];
$content = $page->getContent();