From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 5 May 2011 06:29:33 +0000 (+0000)
Subject: Kill $wgSkinExtensionFunctions. Way back in r4934 when it was introduced, it was... 
X-Git-Tag: 1.31.0-rc.0~30395
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=157466dc5537793a654cae24ce1b2d33a3ed3201;p=lhc%2Fweb%2Fwiklou.git

Kill $wgSkinExtensionFunctions. Way back in r4934 when it was introduced, it was near the beginning of Setup.php, and $wgExtensionFunctions was near the end. Thus, they served two different purposes for doing extension setup. Refactoring over time has brought these processes side-by-side and thus the unused (and less-featured) one is getting the axe.

-1 more awful global \o/
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4946115605..649619b6d1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -60,6 +60,7 @@ production.
 * $wgProfiling has been removed.
 * The spyc library is now no longer included in phase3.
 * (bug 28343) Unused preferences contextlines/contextchars have been removed
+* $wgSkinExtensionFunctions has been removed. Use $wgExtensionFunctions instead.
 
 === New features in 1.18 ===
 * (bug 8130) Query pages should limit to content namespaces, not just main
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5a134f4c0e..4909591f23 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4525,12 +4525,6 @@ $wgExportFromNamespaces = false;
  */
 $wgExtensionFunctions = array();
 
-/**
- * Extension functions for initialisation of skins. This is called somewhat earlier
- * than $wgExtensionFunctions.
- */
-$wgSkinExtensionFunctions = array();
-
 /**
  * Extension messages files.
  *
diff --git a/includes/Setup.php b/includes/Setup.php
index 8e9532466b..d750fbc8c9 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -434,13 +434,6 @@ $wgDeferredUpdateList = array();
 wfProfileOut( $fname . '-globals' );
 wfProfileIn( $fname . '-extensions' );
 
-# Skin setup functions
-# Entries can be added to this variable during the inclusion
-# of the extension file. Skins can then perform any necessary initialisation.
-foreach ( $wgSkinExtensionFunctions as $func ) {
-	call_user_func( $func );
-}
-
 # Extension setup functions for extensions other than skins
 # Entries should be added to this variable during the inclusion
 # of the extension file. This allows the extension to perform
diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php
index 2a727e6b1f..0c09c26f14 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -261,9 +261,9 @@ class SpecialVersion extends SpecialPage {
 	 * @return String: Wikitext
 	 */
 	function getExtensionCredits() {
-		global $wgExtensionCredits, $wgExtensionFunctions, $wgParser, $wgSkinExtensionFunctions;
+		global $wgExtensionCredits, $wgExtensionFunctions, $wgParser;
 
-		if ( !count( $wgExtensionCredits ) && !count( $wgExtensionFunctions ) && !count( $wgSkinExtensionFunctions ) ) {
+		if ( !count( $wgExtensionCredits ) && !count( $wgExtensionFunctions ) ) {
 			return '';
 		}
 
@@ -321,11 +321,6 @@ class SpecialVersion extends SpecialPage {
 			$out .= '<tr><td colspan="4">' . $this->listToText( $fhooks ) . "</td></tr>\n";
 		}
 
-		if ( count( $wgSkinExtensionFunctions ) ) {
-			$out .= $this->openExtType( wfMsg( 'version-skin-extension-functions' ), 'skin-extension-functions' );
-			$out .= '<tr><td colspan="4">' . $this->listToText( $wgSkinExtensionFunctions ) . "</td></tr>\n";
-		}
-
 		$out .= Xml::closeElement( 'table' );
 
 		return $out;