r85063 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r85062‎ | r85063 | r85064 >
Date:13:04, 31 March 2011
Author:reedy
Status:reverted (Comments)
Tags:
Comment:
Fix PHP Fatal error: Cannot redeclare VectorHooks::makeGlobalVariablesScript() in /var/www/mediawiki-1.17/extensions/Vector/Vector.hooks.php on line 158 from r85033
Modified paths:
  • /branches/REL1_17/extensions/Vector/Vector.hooks.php (modified) (history)

Diff [purge]

Index: branches/REL1_17/extensions/Vector/Vector.hooks.php
@@ -137,27 +137,6 @@
138138 public static function makeGlobalVariablesScript( &$vars ) {
139139 global $wgVectorFeatures;
140140
141 - $configurations = array();
142 - foreach ( self::$features as $name => $feature ) {
143 - if (
144 - isset( $feature['configurations'] ) &&
145 - ( !isset( $wgVectorFeatures[$name] ) || self::isEnabled( $name ) )
146 - ) {
147 - foreach ( $feature['configurations'] as $configuration ) {
148 - global $$configuration;
149 - $configurations[$configuration] = $$configuration;
150 - }
151 - }
152 - }
153 - if ( count( $configurations ) ) {
154 - $vars = array_merge( $vars, $configurations );
155 - }
156 - return true;
157 - }
158 -
159 - public static function makeGlobalVariablesScript( &$vars ) {
160 - global $wgVectorFeatures;
161 -
162141 // Build and export old-style wgVectorEnabledModules object for back compat
163142 $enabledModules = array();
164143 foreach ( self::$features as $name => $feature ) {

Follow-up revisions

RevisionCommit summaryAuthorDate
r85065Fix for r85033 (for real this time): had makeGlobalVariablesScript() twice, t...demon13:17, 31 March 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r85033MFT more extension revs: r82601, r82654, r82698, r82755, r82756, r82759, r829...demon18:49, 30 March 2011

Comments

#Comment by 😂 (talk | contribs)   13:09, 31 March 2011

This is wrong, fixing.

Status & tagging log