[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[master]: Flexiskin: Fixed manager loading

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

Change subject: Flexiskin: Fixed manager loading
..


Flexiskin: Fixed manager loading

The Flexiskin manager was loaded on "Special:Specialpages". Now it does
not anymore.

Change-Id: Ib2f86e98853a2a4abf070a8db123776d6cdefc55
---
M Flexiskin/Flexiskin.class.php
M Flexiskin/includes/specials/SpecialFlexiskin.class.php
2 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index edb4766..86b1570 100755
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -39,9 +39,9 @@
 class Flexiskin extends BsExtensionMW {
/**
 * Initialization of Flexiskin extension
- *
- */
-public function __construct() {
+*
+*/
+   public function __construct() {
wfProfileIn( 'BS::' . __METHOD__ );
WikiAdmin::registerModule( 'Flexiskin', array(
'image' => 
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_flexiskin_v1.png',
@@ -49,7 +49,7 @@
'message' => 'bs-flexiskin-label',
'iconCls' => 'bs-icon-painting-roll'
) );
-wfProfileOut( 'BS::' . __METHOD__ );
+   wfProfileOut( 'BS::' . __METHOD__ );
}
 
public function initExt() {
diff --git a/Flexiskin/includes/specials/SpecialFlexiskin.class.php 
b/Flexiskin/includes/specials/SpecialFlexiskin.class.php
index 68e352a..0c52d79 100644
--- a/Flexiskin/includes/specials/SpecialFlexiskin.class.php
+++ b/Flexiskin/includes/specials/SpecialFlexiskin.class.php
@@ -4,18 +4,18 @@
 
public function __construct() {
parent::__construct( 'Flexiskin', 'flexiskin-viewspecialpage' );
-   $this->getOutput()->addModules( "ext.bluespice.flexiskin" );
-   $this->getOutput()->addHTML( '' );
}
 
/**
 *
 * @global OutputPage $this->getOutput()
-* @param type $sParameter
-* @return type
+* @param string $sParameter
+* @return void
 */
public function execute( $sParameter ) {
parent::execute( $sParameter );
 
+   $this->getOutput()->addModules( "ext.bluespice.flexiskin" );
+   $this->getOutput()->addHTML( '' );
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib2f86e98853a2a4abf070a8db123776d6cdefc55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 
Gerrit-Reviewer: Dvogel hallowelt 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
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]: Flexiskin: Fixed manager loading

2016-09-21 Thread Robert Vogel (Code Review) 
Robert Vogel has uploaded a new change for review.

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

Change subject: Flexiskin: Fixed manager loading
..

Flexiskin: Fixed manager loading

The Flexiskin manager was loaded on "Special:Specialpages". Now it does
not anymore.

Change-Id: Ib2f86e98853a2a4abf070a8db123776d6cdefc55
---
M Flexiskin/Flexiskin.class.php
M Flexiskin/includes/specials/SpecialFlexiskin.class.php
2 files changed, 8 insertions(+), 8 deletions(-)


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

diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index edb4766..86b1570 100755
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -39,9 +39,9 @@
 class Flexiskin extends BsExtensionMW {
/**
 * Initialization of Flexiskin extension
- *
- */
-public function __construct() {
+*
+*/
+   public function __construct() {
wfProfileIn( 'BS::' . __METHOD__ );
WikiAdmin::registerModule( 'Flexiskin', array(
'image' => 
'/extensions/BlueSpiceExtensions/WikiAdmin/resources/images/bs-btn_flexiskin_v1.png',
@@ -49,7 +49,7 @@
'message' => 'bs-flexiskin-label',
'iconCls' => 'bs-icon-painting-roll'
) );
-wfProfileOut( 'BS::' . __METHOD__ );
+   wfProfileOut( 'BS::' . __METHOD__ );
}
 
public function initExt() {
diff --git a/Flexiskin/includes/specials/SpecialFlexiskin.class.php 
b/Flexiskin/includes/specials/SpecialFlexiskin.class.php
index 68e352a..0c52d79 100644
--- a/Flexiskin/includes/specials/SpecialFlexiskin.class.php
+++ b/Flexiskin/includes/specials/SpecialFlexiskin.class.php
@@ -4,18 +4,18 @@
 
public function __construct() {
parent::__construct( 'Flexiskin', 'flexiskin-viewspecialpage' );
-   $this->getOutput()->addModules( "ext.bluespice.flexiskin" );
-   $this->getOutput()->addHTML( '' );
}
 
/**
 *
 * @global OutputPage $this->getOutput()
-* @param type $sParameter
-* @return type
+* @param string $sParameter
+* @return void
 */
public function execute( $sParameter ) {
parent::execute( $sParameter );
 
+   $this->getOutput()->addModules( "ext.bluespice.flexiskin" );
+   $this->getOutput()->addHTML( '' );
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib2f86e98853a2a4abf070a8db123776d6cdefc55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel 

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