diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2022-07-28 19:51:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2022-07-28 19:51:45 +0000 |
| commit | 841cbc966bdd35abf7bca1e198eb40a542f13832 (patch) | |
| tree | ba92becb8d75212bfaac56f1fd415312722447df /includes/content | |
| parent | e96bab1cda11903cb3dfc07a25c72ff7dc859bfd (diff) | |
| parent | 008095280a7387b835a0aab9f00ab1d642ed9067 (diff) | |
| download | mediawikicore-841cbc966bdd35abf7bca1e198eb40a542f13832.tar.gz mediawikicore-841cbc966bdd35abf7bca1e198eb40a542f13832.zip | |
Merge "Use canonical parser options when rendering JavaScript/CSS for side effects"
Diffstat (limited to 'includes/content')
| -rw-r--r-- | includes/content/CssContentHandler.php | 6 | ||||
| -rw-r--r-- | includes/content/JavaScriptContentHandler.php | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/includes/content/CssContentHandler.php b/includes/content/CssContentHandler.php index 70a40a617929..50c59ce12825 100644 --- a/includes/content/CssContentHandler.php +++ b/includes/content/CssContentHandler.php @@ -119,7 +119,11 @@ class CssContentHandler extends CodeContentHandler { ->parse( $content->getText(), $cpoParams->getPage(), - $cpoParams->getParserOptions(), + WikiPage::makeParserOptionsFromTitleAndModel( + $cpoParams->getPage(), + $content->getModel(), + 'canonical' + ), true, true, $cpoParams->getRevId() diff --git a/includes/content/JavaScriptContentHandler.php b/includes/content/JavaScriptContentHandler.php index e71b074708e2..a53231f3f443 100644 --- a/includes/content/JavaScriptContentHandler.php +++ b/includes/content/JavaScriptContentHandler.php @@ -127,14 +127,18 @@ class JavaScriptContentHandler extends CodeContentHandler { ) { $textModelsToParse = MediaWikiServices::getInstance()->getMainConfig()->get( MainConfigNames::TextModelsToParse ); - '@phan-var TextContent $content'; + '@phan-var JavaScriptContent $content'; if ( in_array( $content->getModel(), $textModelsToParse ) ) { // parse just to get links etc into the database, HTML is replaced below. $output = MediaWikiServices::getInstance()->getParserFactory()->getInstance() ->parse( $content->getText(), $cpoParams->getPage(), - $cpoParams->getParserOptions(), + WikiPage::makeParserOptionsFromTitleAndModel( + $cpoParams->getPage(), + $content->getModel(), + 'canonical' + ), true, true, $cpoParams->getRevId() |