From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Wed, 6 May 2009 20:02:01 +0000 (+0000)
Subject: If passing a callback in an array in $wgExtensionFunctions, fix the profile name... 
X-Git-Tag: 1.31.0-rc.0~41863
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=998f036bec0d4c102c237c9fe8ef35760856012a;p=lhc%2Fweb%2Fwiklou.git

If passing a callback in an array in $wgExtensionFunctions, fix the profile name to not have 'Setup.php-extensions-Array'
---

diff --git a/includes/Setup.php b/includes/Setup.php
index 98b12c955f..f7119bb2ab 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -308,6 +308,8 @@ foreach ( $wgExtensionFunctions as $func ) {
 	# Allow closures in PHP 5.3+
 	if ( is_object( $func ) && $func instanceof Closure )
 		$profName = $fname.'-extensions-closure';
+	elseif( is_array( $func ) )
+		$profName = $fname.'-extensions-'.implode( '::', $func );
 	else
 		$profName = $fname.'-extensions-'.strval( $func );