[MediaWiki-commits] [Gerrit] Fixed $wgAutoloadClasses for ConfigMerger - change (mediawiki...ZeroPortal)

2014-12-18 Thread Yurik (Code Review) 
Yurik has uploaded a new change for review.

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

Change subject: Fixed $wgAutoloadClasses for ConfigMerger
..

Fixed $wgAutoloadClasses for ConfigMerger

Change-Id: I6535369acc5f0e747e3c351a5477dbf8eea73b35
---
M ZeroPortal.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroPortal 
refs/changes/84/180784/1

diff --git a/ZeroPortal.php b/ZeroPortal.php
index 270aa1f..3282e17 100644
--- a/ZeroPortal.php
+++ b/ZeroPortal.php
@@ -41,12 +41,12 @@
  'ApiZeroPortal',
  'ConfigPageHooks',
  'LuaLibrary',
- 'PortalSpecialPage',
- 'ZeroConfigView',
+ 'PortalSpecialPage',
+ 'ConfigMerger' = 'PortalSpecialPage',
+ 'ZeroConfigView',
   ) as $key = $class ) {
$wgAutoloadClasses['ZeroPortal\\' . ( is_string( $key ) ? $key : $class 
)] = $zpDir . $class . '.php';
 }
-$wgAutoloadClasses['ZeroPortal\\ConfigMerger'] = $zpDir . 
'PortalSpecialPage.php';
 unset( $zpDir );
 
 $wgResourceModules['zeroportal.config'] = array(

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6535369acc5f0e747e3c351a5477dbf8eea73b35
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroPortal
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fixed $wgAutoloadClasses for ConfigMerger - change (mediawiki...ZeroPortal)

2014-12-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fixed $wgAutoloadClasses for ConfigMerger
..


Fixed $wgAutoloadClasses for ConfigMerger

Change-Id: I6535369acc5f0e747e3c351a5477dbf8eea73b35
---
M ZeroPortal.php
1 file changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Yurik: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/ZeroPortal.php b/ZeroPortal.php
index 270aa1f..eaa466a 100644
--- a/ZeroPortal.php
+++ b/ZeroPortal.php
@@ -38,15 +38,15 @@
 // autoload extension classes
 $zpDir .= 'includes' . DIRECTORY_SEPARATOR;
 foreach ( array(
- 'ApiZeroPortal',
- 'ConfigPageHooks',
- 'LuaLibrary',
- 'PortalSpecialPage',
- 'ZeroConfigView',
-  ) as $key = $class ) {
+ 'ApiZeroPortal',
+ 'ConfigPageHooks',
+ 'LuaLibrary',
+ 'PortalSpecialPage',
+ 'ConfigMerger' = 'PortalSpecialPage',
+ 'ZeroConfigView',
+ ) as $key = $class ) {
$wgAutoloadClasses['ZeroPortal\\' . ( is_string( $key ) ? $key : $class 
)] = $zpDir . $class . '.php';
 }
-$wgAutoloadClasses['ZeroPortal\\ConfigMerger'] = $zpDir . 
'PortalSpecialPage.php';
 unset( $zpDir );
 
 $wgResourceModules['zeroportal.config'] = array(

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6535369acc5f0e747e3c351a5477dbf8eea73b35
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ZeroPortal
Gerrit-Branch: master
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Yurik yu...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits