Gerharddiller85 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/307486
Change subject: Merge "Preferences: using extension.json"
......................................................................
Merge "Preferences: using extension.json"
Change-Id: Ie5f078bc39b2868618d204e16f252e0930f713d9
---
M ExtensionInfo/ExtensionInfo.class.php
1 file changed, 15 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/86/307486/1
diff --git a/ExtensionInfo/ExtensionInfo.class.php
b/ExtensionInfo/ExtensionInfo.class.php
index ea80133..ca2c8b3 100644
--- a/ExtensionInfo/ExtensionInfo.class.php
+++ b/ExtensionInfo/ExtensionInfo.class.php
@@ -37,7 +37,22 @@
* @subpackage ExtensionInfo
*/
class ExtensionInfo extends BsExtensionMW {
+<<<<<<< HEAD
/**
+=======
+
+ public function __construct() {
+ wfProfileIn( 'BS::'.__METHOD__ );
+ WikiAdmin::registerModule( 'ExtensionInfo', array(
+ 'image' =>
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_information_v1.png',
+ 'level' => 'wikiadmin',
+ 'message' => 'bs-extensioninfo-label'
+ ) );
+ wfProfileOut( 'BS::'.__METHOD__ );
+ }
+
+ /**
+>>>>>>> f648bbf... ExtensionInfo: using extension.json
* Renders the main form. Called by WikiAdmin
* @return string rendered HTML
*/
--
To view, visit https://gerrit.wikimedia.org/r/307486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5f078bc39b2868618d204e16f252e0930f713d9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Gerharddiller85 <[email protected]>
Gerrit-Reviewer: Ljonka <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
