[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSExtensions: Used callback in extension.json

2016-09-15 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: BSExtensions: Used callback in extension.json
..


BSExtensions: Used callback in extension.json

Change-Id: I20b23ef9dbe79de448610148b699b775ce10d02d
---
M Avatars/Avatars.class.php
M Avatars/Avatars.setup.php
M Avatars/extension.json
M Blog/Blog.class.php
M Blog/Blog.setup.php
M Blog/extension.json
M ExtendedSearch/ExtendedSearch.class.php
M ExtendedSearch/ExtendedSearch.setup.php
M ExtendedSearch/extension.json
M Flexiskin/Flexiskin.class.php
M Flexiskin/Flexiskin.setup.php
M Flexiskin/extension.json
M NamespaceManager/NamespaceManager.class.php
M NamespaceManager/NamespaceManager.setup.php
M NamespaceManager/extension.json
M PageAssignments/PageAssignments.class.php
M PageAssignments/PageAssignments.setup.php
M PageAssignments/extension.json
M PageTemplates/PageTemplates.setup.php
M PageTemplates/PageTemplatesAdmin.class.php
M PermissionManager/PermissionManager.class.php
M PermissionManager/PermissionManager.setup.php
M PermissionManager/extension.json
M SecureFileStore/SecureFileStore.class.php
M SecureFileStore/SecureFileStore.setup.php
M SecureFileStore/extension.json
M UEModulePDF/UEModulePDF.class.php
M UEModulePDF/UEModulePDF.setup.php
M UEModulePDF/extension.json
M WikiAdmin/WikiAdmin.class.php
M WikiAdmin/WikiAdmin.setup.php
M WikiAdmin/extension.json
32 files changed, 240 insertions(+), 277 deletions(-)

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



diff --git a/Avatars/Avatars.class.php b/Avatars/Avatars.class.php
index ded435b..9501a3c 100644
--- a/Avatars/Avatars.class.php
+++ b/Avatars/Avatars.class.php
@@ -59,6 +59,21 @@
}
 
/**
+* extension.json callback
+* @global array $wgForeignFileRepos
+*/
+   public static function onRegistration() {
+   global $wgForeignFileRepos;
+   $wgForeignFileRepos[] = array(
+   'class' => 'FSRepo',
+   'name' => 'Avatars',
+   'directory' => BS_DATA_DIR . '/Avatars/',
+   'hashLevels' => 0,
+   'url' => BS_DATA_PATH . '/Avatars',
+   );
+   }
+
+   /**
 * Adds module
 * @param OutputPage $out
 * @param SkinTemplate $skin
diff --git a/Avatars/Avatars.setup.php b/Avatars/Avatars.setup.php
index 5aa37a8..12278f4 100644
--- a/Avatars/Avatars.setup.php
+++ b/Avatars/Avatars.setup.php
@@ -1,11 +1,3 @@
  'FSRepo',
-   'name' => 'Avatars',
-   'directory' => BS_DATA_DIR . '/Avatars/',
-   'hashLevels' => 0,
-   'url' => BS_DATA_PATH . '/Avatars',
-);
\ No newline at end of file
+wfLoadExtension( 'BlueSpiceExtensions/Avatars' );
\ No newline at end of file
diff --git a/Avatars/extension.json b/Avatars/extension.json
index d589a19..866cbc3 100644
--- a/Avatars/extension.json
+++ b/Avatars/extension.json
@@ -11,6 +11,7 @@
"extPath": "/BlueSpiceExtensions/Avatars"
}
},
+   "callback": "Avatars::onRegistration",
"APIModules": {
"bs-avatars-tasks": "BSApiAvatarsTasks"
},
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 5c6c55d..442f2ce 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -92,6 +92,13 @@
}
 
/**
+* extension.json callback
+*/
+   public static function onRegistration() {
+   BsExtensionManager::registerNamespace( 'Blog', 2 );
+   }
+
+   /**
 * Adds entry to navigation sites
 * @global string $wgScriptPath
 * @param array $aNavigationSites
diff --git a/Blog/Blog.setup.php b/Blog/Blog.setup.php
index b89293d..371b101 100644
--- a/Blog/Blog.setup.php
+++ b/Blog/Blog.setup.php
@@ -1,4 +1,2 @@
  'FSRepo',
+   'name' => 'Flexiskin',
+   'directory' => BS_DATA_DIR . '/Flexiskin/',
+   'hashLevels' => 0,
+   'url' => BS_DATA_PATH . '/Flexiskin',
+   );
+   }
+
public function runPreferencePlugin( $sAdapterName, BsConfig $oVariable 
) {
if ( substr( $oVariable->getKey(), 0, 13 ) != "MW::Flexiskin" ){
return array();
diff --git a/Flexiskin/Flexiskin.setup.php b/Flexiskin/Flexiskin.setup.php
index 95e48a4..25c5034 100755
--- a/Flexiskin/Flexiskin.setup.php
+++ b/Flexiskin/Flexiskin.setup.php
@@ -1,10 +1,2 @@
  'FSRepo',
-   'name' => 'Flexiskin',
-   'directory' => BS_DATA_DIR . '/Flexiskin/',
-   'hashLevels' => 0,
-   'url' => BS_DATA_PATH . '/Flexiskin',
-);
\ No newline at end of file
+wfLoadExtension( 'BlueSpiceExtensions/Flexiskin' );
\ No newline at end of file
diff --git a/Flexiskin/extension.json b/Flexiskin/extension.json
index 591c229..2e747d3 100644
--- a/Flexiskin/extension.json
+++ b/Flexiskin/extension.json
@@ -1

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: BSExtensions: Used callback in extension.json

2016-09-15 Thread Pwirth (Code Review) 
Pwirth has uploaded a new change for review.

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

Change subject: BSExtensions: Used callback in extension.json
..

BSExtensions: Used callback in extension.json

Change-Id: I20b23ef9dbe79de448610148b699b775ce10d02d
---
M Avatars/Avatars.class.php
M Avatars/Avatars.setup.php
M Avatars/extension.json
M Blog/Blog.class.php
M Blog/Blog.setup.php
M Blog/extension.json
M ExtendedSearch/ExtendedSearch.class.php
M ExtendedSearch/ExtendedSearch.setup.php
M ExtendedSearch/extension.json
M Flexiskin/Flexiskin.class.php
M Flexiskin/Flexiskin.setup.php
M Flexiskin/extension.json
M NamespaceManager/NamespaceManager.class.php
M NamespaceManager/NamespaceManager.setup.php
M NamespaceManager/extension.json
M PageAssignments/PageAssignments.class.php
M PageAssignments/PageAssignments.setup.php
M PageAssignments/extension.json
M PageTemplates/PageTemplates.setup.php
M PageTemplates/PageTemplatesAdmin.class.php
M PermissionManager/PermissionManager.class.php
M PermissionManager/PermissionManager.setup.php
M PermissionManager/extension.json
M SecureFileStore/SecureFileStore.class.php
M SecureFileStore/SecureFileStore.setup.php
M SecureFileStore/extension.json
M UEModulePDF/UEModulePDF.class.php
M UEModulePDF/UEModulePDF.setup.php
M UEModulePDF/extension.json
M WikiAdmin/WikiAdmin.class.php
M WikiAdmin/WikiAdmin.setup.php
M WikiAdmin/extension.json
32 files changed, 240 insertions(+), 277 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions 
refs/changes/64/310764/1

diff --git a/Avatars/Avatars.class.php b/Avatars/Avatars.class.php
index ded435b..9501a3c 100644
--- a/Avatars/Avatars.class.php
+++ b/Avatars/Avatars.class.php
@@ -59,6 +59,21 @@
}
 
/**
+* extension.json callback
+* @global array $wgForeignFileRepos
+*/
+   public static function onRegistration() {
+   global $wgForeignFileRepos;
+   $wgForeignFileRepos[] = array(
+   'class' => 'FSRepo',
+   'name' => 'Avatars',
+   'directory' => BS_DATA_DIR . '/Avatars/',
+   'hashLevels' => 0,
+   'url' => BS_DATA_PATH . '/Avatars',
+   );
+   }
+
+   /**
 * Adds module
 * @param OutputPage $out
 * @param SkinTemplate $skin
diff --git a/Avatars/Avatars.setup.php b/Avatars/Avatars.setup.php
index 5aa37a8..12278f4 100644
--- a/Avatars/Avatars.setup.php
+++ b/Avatars/Avatars.setup.php
@@ -1,11 +1,3 @@
  'FSRepo',
-   'name' => 'Avatars',
-   'directory' => BS_DATA_DIR . '/Avatars/',
-   'hashLevels' => 0,
-   'url' => BS_DATA_PATH . '/Avatars',
-);
\ No newline at end of file
+wfLoadExtension( 'BlueSpiceExtensions/Avatars' );
\ No newline at end of file
diff --git a/Avatars/extension.json b/Avatars/extension.json
index d589a19..866cbc3 100644
--- a/Avatars/extension.json
+++ b/Avatars/extension.json
@@ -11,6 +11,7 @@
"extPath": "/BlueSpiceExtensions/Avatars"
}
},
+   "callback": "Avatars::onRegistration",
"APIModules": {
"bs-avatars-tasks": "BSApiAvatarsTasks"
},
diff --git a/Blog/Blog.class.php b/Blog/Blog.class.php
index 5c6c55d..442f2ce 100644
--- a/Blog/Blog.class.php
+++ b/Blog/Blog.class.php
@@ -92,6 +92,13 @@
}
 
/**
+* extension.json callback
+*/
+   public static function onRegistration() {
+   BsExtensionManager::registerNamespace( 'Blog', 2 );
+   }
+
+   /**
 * Adds entry to navigation sites
 * @global string $wgScriptPath
 * @param array $aNavigationSites
diff --git a/Blog/Blog.setup.php b/Blog/Blog.setup.php
index b89293d..371b101 100644
--- a/Blog/Blog.setup.php
+++ b/Blog/Blog.setup.php
@@ -1,4 +1,2 @@
  'FSRepo',
+   'name' => 'Flexiskin',
+   'directory' => BS_DATA_DIR . '/Flexiskin/',
+   'hashLevels' => 0,
+   'url' => BS_DATA_PATH . '/Flexiskin',
+   );
+   }
+
public function runPreferencePlugin( $sAdapterName, BsConfig $oVariable 
) {
if ( substr( $oVariable->getKey(), 0, 13 ) != "MW::Flexiskin" ){
return array();
diff --git a/Flexiskin/Flexiskin.setup.php b/Flexiskin/Flexiskin.setup.php
index 95e48a4..25c5034 100755
--- a/Flexiskin/Flexiskin.setup.php
+++ b/Flexiskin/Flexiskin.setup.php
@@ -1,10 +1,2 @@
  'FSRepo',
-   'name' => 'Flexiskin',
-   'directory' => BS_DATA_DIR . '/Flexiskin/',
-   'hashLevels' => 0,
-   'url' => BS_DATA_PATH . '/Flexiskin',
-);
\ No newline at end of file
+wfLoadExtension( 'BlueSpiceExtensions/Flexiskin' );
\ No newline at end of file
diff --git a/Flexiskin/extension.json b/Flexiskin/extension.json
index 591c229..2e747d3 100644
--- a/