[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceFoundation[master]: fixed prefix of default options by pwirth.

2017-02-16 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/338092 )

Change subject: fixed prefix of default options by pwirth.
..


fixed prefix of default options by pwirth.

Change-Id: Ife0462dc7e128803501457845469fb35d4c4c449
---
M includes/entityconfigs/EntityConfig.php
1 file changed, 8 insertions(+), 7 deletions(-)

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



diff --git a/includes/entityconfigs/EntityConfig.php 
b/includes/entityconfigs/EntityConfig.php
index c19fdc9..29abd3d 100644
--- a/includes/entityconfigs/EntityConfig.php
+++ b/includes/entityconfigs/EntityConfig.php
@@ -62,23 +62,24 @@
return static::$aEntityConfigs[$sType];
}
 
-   protected static function getDefault( $sMethod ) {
-   if( !isset(static::$aDefaults[$sMethod]) ) {
+
+   protected static function getDefault( $sOption ) {
+   if( !isset(static::$aDefaults[$sOption]) ) {
return false;
}
-   return static::$aDefaults[$sMethod];
+   return static::$aDefaults[$sOption];
}
 
/**
 * Getter for config methods
-* @param string $sMethod
+* @param string $sOption
 * @return mixed - The return value of the internaly called method or 
the
 * default
 */
-   public function get( $sMethod ) {
-   $sMethod = "get_$sMethod";
+   public function get( $sOption ) {
+   $sMethod = "get_$sOption";
if( !is_callable( array($this, $sMethod) ) ) {
-   return static::getDefault( $sMethod );
+   return static::getDefault( $sOption );
}
return $this->$sMethod();
}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife0462dc7e128803501457845469fb35d4c4c449
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Nasty 
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...BlueSpiceFoundation[master]: fixed prefix of default options by pwirth.

2017-02-16 Thread Nasty (Code Review)
Nasty has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/338092 )

Change subject: fixed prefix of default options by pwirth.
..

fixed prefix of default options by pwirth.

Change-Id: Ife0462dc7e128803501457845469fb35d4c4c449
---
M includes/entityconfigs/EntityConfig.php
1 file changed, 8 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/92/338092/1

diff --git a/includes/entityconfigs/EntityConfig.php 
b/includes/entityconfigs/EntityConfig.php
index c19fdc9..29abd3d 100644
--- a/includes/entityconfigs/EntityConfig.php
+++ b/includes/entityconfigs/EntityConfig.php
@@ -62,23 +62,24 @@
return static::$aEntityConfigs[$sType];
}
 
-   protected static function getDefault( $sMethod ) {
-   if( !isset(static::$aDefaults[$sMethod]) ) {
+
+   protected static function getDefault( $sOption ) {
+   if( !isset(static::$aDefaults[$sOption]) ) {
return false;
}
-   return static::$aDefaults[$sMethod];
+   return static::$aDefaults[$sOption];
}
 
/**
 * Getter for config methods
-* @param string $sMethod
+* @param string $sOption
 * @return mixed - The return value of the internaly called method or 
the
 * default
 */
-   public function get( $sMethod ) {
-   $sMethod = "get_$sMethod";
+   public function get( $sOption ) {
+   $sMethod = "get_$sOption";
if( !is_callable( array($this, $sMethod) ) ) {
-   return static::getDefault( $sMethod );
+   return static::getDefault( $sOption );
}
return $this->$sMethod();
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife0462dc7e128803501457845469fb35d4c4c449
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Nasty 

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