subject:"\[MediaWiki\-commits\] \[Gerrit\] cherry pick from REL1_22 Change\-Id\: I6759c48b91afb9ac74edebe... \- change \(mediawiki...BlueSpiceExtensions\)"

[MediaWiki-commits] [Gerrit] cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebe... - change (mediawiki...BlueSpiceExtensions)

2015-04-01 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged.

Change subject: cherry pick from REL1_22 Change-Id: 
I6759c48b91afb9ac74edebed2c1e42989fa89052
..


cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebed2c1e42989fa89052

PatchSet 2: Fixed whitespace error

Change-Id: I31ab69f0959d48878862b8ccad609bf4c5b91dc8
---
M Flexiskin/Flexiskin.class.php
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 54c3167..404f8b7 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -294,7 +294,7 @@
$oStatus = BsFileSystemHelper::uploadFile(self::getVal('name'), 
flexiskin . DS . self::getVal('id') . DS . images);
 
if (!$oStatus-isGood())
-   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $aStatus['status']));
+   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $oStatus-getMessage()));
else
$aResult = json_encode(array('success' = true, 'name' 
= $oStatus-getValue()));
$oAjaxResponse = new AjaxResponse( $aResult );
@@ -313,7 +313,8 @@
$aConfigs = json_decode($aConfigs);
foreach ($aConfigs as $aConfig) {
$func = Flexiskin::format_ . $aConfig-id;
-   if (is_callable($func))
+   $bReturn = wfRunHooks(BSFlexiskinGenerateStyleFile, 
array($func, $aConfig));
+   if ( $bReturn === true  is_callable($func))
$aFile[] = call_user_func($func, $aConfig);
}
return implode( \n, $aFile);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31ab69f0959d48878862b8ccad609bf4c5b91dc8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebe... - change (mediawiki...BlueSpiceExtensions)

2015-03-31 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

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

Change subject: cherry pick from REL1_22 Change-Id: 
I6759c48b91afb9ac74edebed2c1e42989fa89052
..

cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebed2c1e42989fa89052

Change-Id: I31ab69f0959d48878862b8ccad609bf4c5b91dc8
---
M Flexiskin/Flexiskin.class.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 54c3167..943702b 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -294,7 +294,7 @@
$oStatus = BsFileSystemHelper::uploadFile(self::getVal('name'), 
flexiskin . DS . self::getVal('id') . DS . images);
 
if (!$oStatus-isGood())
-   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $aStatus['status']));
+   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $oStatus-getMessage()));
else
$aResult = json_encode(array('success' = true, 'name' 
= $oStatus-getValue()));
$oAjaxResponse = new AjaxResponse( $aResult );
@@ -313,7 +313,9 @@
$aConfigs = json_decode($aConfigs);
foreach ($aConfigs as $aConfig) {
$func = Flexiskin::format_ . $aConfig-id;
-   if (is_callable($func))
+   $bReturn = wfRunHooks(BSFlexiskinGenerateStyleFile, 
array($func, $aConfig));
+   
+   if ( $bReturn === true  is_callable($func))
$aFile[] = call_user_func($func, $aConfig);
}
return implode( \n, $aFile);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I31ab69f0959d48878862b8ccad609bf4c5b91dc8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebe... - change (mediawiki...BlueSpiceExtensions)

2015-03-31 Thread Tweichart (Code Review)

Tweichart has uploaded a new change for review.

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

Change subject: cherry pick from REL1_22 Change-Id: 
I6759c48b91afb9ac74edebed2c1e42989fa89052
..

cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebed2c1e42989fa89052

Change-Id: I18379577769e889dc923d29644881957f63e6588
---
M Flexiskin/Flexiskin.class.php
1 file changed, 4 insertions(+), 2 deletions(-)


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

diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 54c3167..898fc01 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -294,7 +294,7 @@
$oStatus = BsFileSystemHelper::uploadFile(self::getVal('name'), 
flexiskin . DS . self::getVal('id') . DS . images);
 
if (!$oStatus-isGood())
-   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $aStatus['status']));
+   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $oStatus-getMessage()));
else
$aResult = json_encode(array('success' = true, 'name' 
= $oStatus-getValue()));
$oAjaxResponse = new AjaxResponse( $aResult );
@@ -313,7 +313,9 @@
$aConfigs = json_decode($aConfigs);
foreach ($aConfigs as $aConfig) {
$func = Flexiskin::format_ . $aConfig-id;
-   if (is_callable($func))
+   $bReturn = wfRunHooks(BSFlexiskinGenerateStyleFile, 
array($func, $aConfig));
+
+   if ( $bReturn === true  is_callable($func))
$aFile[] = call_user_func($func, $aConfig);
}
return implode( \n, $aFile);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18379577769e889dc923d29644881957f63e6588
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz

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

[MediaWiki-commits] [Gerrit] cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebe... - change (mediawiki...BlueSpiceExtensions)

2015-03-31 Thread Robert Vogel (Code Review)

Robert Vogel has submitted this change and it was merged.

Change subject: cherry pick from REL1_22 Change-Id: 
I6759c48b91afb9ac74edebed2c1e42989fa89052
..


cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebed2c1e42989fa89052

Change-Id: I18379577769e889dc923d29644881957f63e6588
---
M Flexiskin/Flexiskin.class.php
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Robert Vogel: Verified; Looks good to me, approved



diff --git a/Flexiskin/Flexiskin.class.php b/Flexiskin/Flexiskin.class.php
index 54c3167..898fc01 100644
--- a/Flexiskin/Flexiskin.class.php
+++ b/Flexiskin/Flexiskin.class.php
@@ -294,7 +294,7 @@
$oStatus = BsFileSystemHelper::uploadFile(self::getVal('name'), 
flexiskin . DS . self::getVal('id') . DS . images);
 
if (!$oStatus-isGood())
-   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $aStatus['status']));
+   $aResult = json_encode(array('success' = false, 'msg' 
= err_cd: . $oStatus-getMessage()));
else
$aResult = json_encode(array('success' = true, 'name' 
= $oStatus-getValue()));
$oAjaxResponse = new AjaxResponse( $aResult );
@@ -313,7 +313,9 @@
$aConfigs = json_decode($aConfigs);
foreach ($aConfigs as $aConfig) {
$func = Flexiskin::format_ . $aConfig-id;
-   if (is_callable($func))
+   $bReturn = wfRunHooks(BSFlexiskinGenerateStyleFile, 
array($func, $aConfig));
+
+   if ( $bReturn === true  is_callable($func))
$aFile[] = call_user_func($func, $aConfig);
}
return implode( \n, $aFile);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18379577769e889dc923d29644881957f63e6588
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebe... - change (mediawiki...BlueSpiceExtensions)

[MediaWiki-commits] [Gerrit] cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebe... - change (mediawiki...BlueSpiceExtensions)

[MediaWiki-commits] [Gerrit] cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebe... - change (mediawiki...BlueSpiceExtensions)

[MediaWiki-commits] [Gerrit] cherry pick from REL1_22 Change-Id: I6759c48b91afb9ac74edebe... - change (mediawiki...BlueSpiceExtensions)

4 matches

Site Navigation

Mail list logo

Footer information