X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FOutputPage.php;h=99dd4a7c0e629c77591b82723db2cbf6c7b7a2cf;hp=f95327a72b4b252c5c1ba6e9463b95359d62f9dc;hb=048089ae3a052deaac1003996247ce86e5a60bfc;hpb=b610a3b617f7616b2f1db12498cbad5aeae12576 diff --git a/includes/OutputPage.php b/includes/OutputPage.php index f95327a72b..99dd4a7c0e 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2788,7 +2788,9 @@ class OutputPage extends ContextSource { $this->rlUserModuleState = $exemptStates['user'] = $userState; } - $rlClient = new ResourceLoaderClientHtml( $context, $this->getTarget() ); + $rlClient = new ResourceLoaderClientHtml( $context, [ + 'target' => $this->getTarget(), + ] ); $rlClient->setConfig( $this->getJSVars() ); $rlClient->setModules( $this->getModules( /*filter*/ true ) ); $rlClient->setModuleStyles( $moduleStyles ); @@ -2945,14 +2947,14 @@ class OutputPage extends ContextSource { private function isUserJsPreview() { return $this->getConfig()->get( 'AllowUserJs' ) && $this->getTitle() - && $this->getTitle()->isJsSubpage() + && $this->getTitle()->isUserJsConfigPage() && $this->userCanPreview(); } protected function isUserCssPreview() { return $this->getConfig()->get( 'AllowUserCss' ) && $this->getTitle() - && $this->getTitle()->isCssSubpage() + && $this->getTitle()->isUserCssConfigPage() && $this->userCanPreview(); } @@ -3204,7 +3206,10 @@ class OutputPage extends ContextSource { } $title = $this->getTitle(); - if ( !$title->isJsSubpage() && !$title->isCssSubpage() ) { + if ( + !$title->isUserJsConfigPage() + && !$title->isUserCssConfigPage() + ) { return false; } if ( !$title->isSubpageOf( $user->getUserPage() ) ) {