[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: move registration to special callback function make setup ba...

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

Change subject: move registration to special callback function make setup 
backward compatible and false tolerant change used bsfoundation version in 
composer
..


move registration to special callback function
make setup backward compatible and false tolerant
change used bsfoundation version in composer

Change-Id: I416a9445d1f567f6a4320bde370ec1391dd401a4
---
A BlueSpiceExtensions.class.php
M BlueSpiceExtensions.php
M composer.json
A extension.json
4 files changed, 30 insertions(+), 5 deletions(-)

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



diff --git a/BlueSpiceExtensions.class.php b/BlueSpiceExtensions.class.php
new file mode 100644
index 000..3c5ebb5
--- /dev/null
+++ b/BlueSpiceExtensions.class.php
@@ -0,0 +1,15 @@
+clearQueue();
+
+   require_once( __DIR__ . "/BlueSpiceExtensions.php" );
+
+   //now manualy start ExtensionRegistry queue to load later added 
extensions
+   ExtensionRegistry::getInstance()->loadFromQueue();
+   }
+}
diff --git a/BlueSpiceExtensions.php b/BlueSpiceExtensions.php
index 2dd1964..38525ce 100644
--- a/BlueSpiceExtensions.php
+++ b/BlueSpiceExtensions.php
@@ -7,10 +7,10 @@
  * starting point
  */
 
-if ( file_exists( __DIR__ . 
'/vendor/hallowelt/bluespice-foundation/BlueSpiceFoundation.php' ) ) {
-   require_once __DIR__ . 
'/vendor/hallowelt/bluespice-foundation/BlueSpiceFoundation.php';
-} elseif ( file_exists( __DIR__ . 
'/../../vendor/hallowelt/bluespice-foundation/BlueSpiceFoundation.php' ) ) {
-   require_once __DIR__ . 
'/../../vendor/hallowelt/bluespice-foundation/BlueSpiceFoundation.php';
+if ( file_exists( __DIR__ . 
'/vendor/hallowelt/blue-spice-foundation/BlueSpiceFoundation.php' ) ) {
+   require_once __DIR__ . 
'/vendor/hallowelt/blue-spice-foundation/BlueSpiceFoundation.php';
+} elseif ( file_exists( __DIR__ . 
'/../../vendor/hallowelt/blue-spice-foundation/BlueSpiceFoundation.php' ) ) {
+   require_once __DIR__ . 
'/../../vendor/hallowelt/blue-spice-foundation/BlueSpiceFoundation.php';
 }
 
 if ( file_exists( __DIR__ . '/BlueSpiceExtensions.local.php' ) ) {
diff --git a/composer.json b/composer.json
index bb57c0b..acaa17c 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
}
],
"require": {
-   "hallowelt/blue-spice-foundation": "~2.27"
+   "hallowelt/blue-spice-foundation": "2.27.1-beta"
},
"support": {
"issues": "https://sourceforge.net/projects/bluespice/support";,
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..e03ea94
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,10 @@
+{
+   "name": "BlueSpiceExtensions",
+   "version": "2.27.1",
+   "url": "https://www.mediawiki.org/wiki/BlueSpice";,
+   "authors": [ "Hallo Welt! GmbH" ],
+   "AutoloadClasses":{
+   "BlueSpiceExtensions":"BlueSpiceExtensions.class.php"
+   },
+   "callback": "BlueSpiceExtensions::onRegistration"
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I416a9445d1f567f6a4320bde370ec1391dd401a4
Gerrit-PatchSet: 23
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Ljonka 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: move registration to special callback function

2016-10-12 Thread Ljonka (Code Review) 
Ljonka has uploaded a new change for review.

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

Change subject: move registration to special callback function
..

move registration to special callback function

Change-Id: I416a9445d1f567f6a4320bde370ec1391dd401a4
---
M BlueSpiceExtensions.php
A extension.json
2 files changed, 28 insertions(+), 9 deletions(-)


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

diff --git a/BlueSpiceExtensions.php b/BlueSpiceExtensions.php
index 2dd1964..9853779 100644
--- a/BlueSpiceExtensions.php
+++ b/BlueSpiceExtensions.php
@@ -7,14 +7,23 @@
  * starting point
  */
 
-if ( file_exists( __DIR__ . 
'/vendor/hallowelt/bluespice-foundation/BlueSpiceFoundation.php' ) ) {
-   require_once __DIR__ . 
'/vendor/hallowelt/bluespice-foundation/BlueSpiceFoundation.php';
-} elseif ( file_exists( __DIR__ . 
'/../../vendor/hallowelt/bluespice-foundation/BlueSpiceFoundation.php' ) ) {
-   require_once __DIR__ . 
'/../../vendor/hallowelt/bluespice-foundation/BlueSpiceFoundation.php';
-}
+class BlueSpiceExtensions{
+   public static function onRegistration(){
 
-if ( file_exists( __DIR__ . '/BlueSpiceExtensions.local.php' ) ) {
-   require_once __DIR__ . '/BlueSpiceExtensions.local.php';
-} else {
-   require_once __DIR__ . '/BlueSpiceExtensions.default.php';
+   ExtensionRegistry::getInstance()->clearQueue();
+   if ( file_exists( __DIR__ . 
'/vendor/hallowelt/bluespice-foundation/BlueSpiceFoundation.php' ) ) {
+   require_once __DIR__ . 
'/vendor/hallowelt/bluespice-foundation/BlueSpiceFoundation.php';
+   } elseif ( file_exists( __DIR__ . 
'/../../vendor/hallowelt/bluespice-foundation/BlueSpiceFoundation.php' ) ) {
+   require_once __DIR__ . 
'/../../vendor/hallowelt/bluespice-foundation/BlueSpiceFoundation.php';
+   }
+
+
+   if ( file_exists( __DIR__ . '/BlueSpiceExtensions.local.php' ) 
) {
+   require_once __DIR__ . '/BlueSpiceExtensions.local.php';
+   } else {
+   require_once __DIR__ . 
'/BlueSpiceExtensions.default.php';
+   }
+   //now manualy start ExtensionRegistry queue to load later added 
extensions
+   ExtensionRegistry::getInstance()->loadFromQueue();
+   }
 }
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..b3008c8
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,10 @@
+{
+  "name": "BlueSpiceExtensions",
+   "version": "2.27.1",
+   "url": "https://www.mediawiki.org/wiki/BlueSpice";,
+   "authors": ["Hallo Welt! GmbH"],
+  "AutoloadClasses":{
+"BlueSpiceExtensions":"./BlueSpiceExtensions.php"
+  },
+  "callback": "BlueSpiceExtensions::onRegistration"
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I416a9445d1f567f6a4320bde370ec1391dd401a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Ljonka 

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