From b89bffd7836203c95b25de3336a52a1bff40d6fa Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Thu, 29 Dec 2011 20:39:29 +0000 Subject: [PATCH] * (bug 32702) Fix for r82273: readded Skin::makeGlobalVariablesScript() for backward compatibility and marked it as deprecated --- RELEASE-NOTES-1.19 | 2 ++ includes/OutputPage.php | 5 ++++- includes/Skin.php | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index c75295d115..5e39e81089 100644 --- a/RELEASE-NOTES-1.19 +++ b/RELEASE-NOTES-1.19 @@ -199,6 +199,8 @@ production. * (bug 31719) Recognize &ns_svg; as the svg namespace when extracting width * (bug 30914) Embeddable ResourceLoader modules (user.options, user.tokens) should be loaded in for proper dependency resolution +* (bug 32702) Removed method Skin::makeGlobalVariablesScript() has been readded + for backward compatibility === API changes in 1.19 === * (bug 19838) siprop=interwikimap can now use the interwiki cache. diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 7b8d4cd9d8..c83401fa49 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -2767,13 +2767,16 @@ $templates /** * Get an array containing the variables to be set in mw.config in JavaScript. * + * DO NOT CALL THIS FROM OUTSIDE OF THIS CLASS OR Skin::makeGlobalVariablesScript(). + * This is only public until that function is removed. You have been warned. + * * Do not add things here which can be evaluated in ResourceLoaderStartupScript * - in other words, page-independent/site-wide variables (without state). * You will only be adding bloat to the html page and causing page caches to * have to be purged on configuration changes. * @return array */ - protected function getJSVars() { + public function getJSVars() { global $wgUseAjax, $wgEnableMWSuggest; $title = $this->getTitle(); diff --git a/includes/Skin.php b/includes/Skin.php index 0416112d84..9ecb6150b3 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -301,6 +301,21 @@ abstract class Skin extends ContextSource { } } + /** + * Make a