Bartosz Dziewoński has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/148665

Change subject: Turn $wgExtensionFunctions[] closure into a function
......................................................................

Turn $wgExtensionFunctions[] closure into a function

Toplevel closures can apparently cause random crashed on PHP 5.3 with
APC, which is the setup WMF uses. Better safe than sorry, right?

Also added some `global` declarations. I don't think this has ever worked…

https://bugs.php.net/bug.php?id=52144

Change-Id: I1b4487c2403e297921be56037672a3f1a0d8d57a
---
M GlobalCssJs.php
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalCssJs 
refs/changes/65/148665/1

diff --git a/GlobalCssJs.php b/GlobalCssJs.php
index fa5ae30..c54810b 100644
--- a/GlobalCssJs.php
+++ b/GlobalCssJs.php
@@ -52,13 +52,16 @@
 $wgAutoloadClasses['GlobalCssJsHooks'] = __DIR__ . '/GlobalCssJs.hooks.php';
 $wgMessagesDirs['GlobalCssJs'] = __DIR__ . '/i18n/core';
 $wgExtensionMessagesFiles['GlobalCssJs'] = __DIR__ . '/GlobalCssJs.i18n.php';
-$wgExtensionFunctions[] = function () {
-       global $wgGlobalCssJsConfig, $wgUseGlobalSiteCssJs;
+
+$wgExtensionFunctions[] = 'efGlobalCssJs';
+function efGlobalCssJs() {
+       global $wgGlobalCssJsConfig, $wgUseGlobalSiteCssJs,
+               $wgMessagesDirs, $wgExtensionMessagesFiles;
        if ( $wgGlobalCssJsConfig['wiki'] === wfWikiID() && 
$wgUseGlobalSiteCssJs ) {
                $wgMessagesDirs['GlobalCssJsCentral'] = __DIR__ . 
'/i18n/central';
                $wgExtensionMessagesFiles['GlobalCssJsCentral'] = __DIR__ . 
'/GlobalCssJs.central.i18n.php';
        }
-};
+}
 
 $wgHooks['BeforePageDisplay'][] = 'GlobalCssJsHooks::onBeforePageDisplay';
 $wgHooks['ResourceLoaderRegisterModules'][] = 
'GlobalCssJsHooks::onResourceLoaderRegisterModules';

-- 
To view, visit https://gerrit.wikimedia.org/r/148665
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b4487c2403e297921be56037672a3f1a0d8d57a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalCssJs
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to