hauke/Magallanes
1
0
Fork 0
mirror of https://github.com/hauke68/Magallanes.git synced 2025-09-13 04:30:17 +02:00
Code Issues Releases Wiki Activity

Fixes on Config parser for new Yaml library.

Browse Source
This commit is contained in:
Andrs Montaez 2012-02-15 19:18:19 -02:00
parent 51e7de0676
commit 4863990f68
3 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Mage/Config.php
View File

@ -158,7 +158,11 @@ class Mage_Config
{ {
$options = $this->getEnvironment(); $options = $this->getEnvironment();
if (isset($options['deployment'][$option])) { if (isset($options['deployment'][$option])) {
return $options['deployment'][$option]; if (is_array($default) && ($options['deployment'][$option] == '')) {
return $default;
} else {
return $options['deployment'][$option];
}
} else { } else {
return $default; return $default;
} }
@ -167,8 +171,12 @@ class Mage_Config
public function release($option, $default = false) public function release($option, $default = false)
{ {
$options = $this->getEnvironment(); $options = $this->getEnvironment();
if (isset($options['releases'][$option])) { if (isset($options['releases'][$option])) {
return $options['releases'][$option]; if (is_array($default) && ($options['releases'][$option] == '')) {
return $default;
} else {
return $options['releases'][$option];
}
} else { } else {
return $default; return $default;
} }
@ -177,7 +185,12 @@ class Mage_Config
public function scm($option, $default = false) public function scm($option, $default = false)
{ {
$options = $this->_scm; $options = $this->_scm;
if (isset($options[$option])) { if (isset($options[$option])) {
if (is_array($default) && ($options[$option] == '')) {
return $default;
} else {
return $options[$option];
}
return $options[$option]; return $options[$option];
} else { } else {
return $default; return $default;
@ -187,8 +200,12 @@ class Mage_Config
public function general($option, $default = false) public function general($option, $default = false)
{ {
$options = $this->_general; $options = $this->_general;
if (isset($options[$option])) { if (isset($options[$option])) {
return $options[$option]; if (is_array($default) && ($options[$option] == '')) {
return $default;
} else {
return $options[$option];
}
} else { } else {
return $default; return $default;
} }
@ -197,8 +214,12 @@ class Mage_Config
public function mail($option, $default = false) public function mail($option, $default = false)
{ {
$options = $this->_general; $options = $this->_general;
if (isset($options['mail'][$option])) { if (isset($options['mail'][$option])) {
return $options['mail'][$option]; if (is_array($default) && ($options['mail'][$option] == '')) {
return $default;
} else {
return $options['mail'][$option];
}
} else { } else {
return $default; return $default;
} }

2
bin/mage
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
#VERSION:0.9.4 #VERSION:0.9.5
SCRIPT=$(readlink -f $0) SCRIPT=$(readlink -f $0)
DIR=$(dirname $SCRIPT) DIR=$(dirname $SCRIPT)

2
bin/mage.php
View File

@ -24,7 +24,7 @@ date_default_timezone_set('UTC');
$baseDir = dirname(dirname(__FILE__)); $baseDir = dirname(dirname(__FILE__));
define('MAGALLANES_VERSION', '0.9.4'); define('MAGALLANES_VERSION', '0.9.5');
require_once $baseDir . '/Mage/spyc.php'; require_once $baseDir . '/Mage/spyc.php';
require_once $baseDir . '/Mage/Autoload.php'; require_once $baseDir . '/Mage/Autoload.php';