GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

error in get_option_value wasn't returning a value

This commit is contained in:
Evan Prodromou 2009-06-28 17:02:31 -04:00
parent 7a0d33ab5f
commit 3ac6b7d120
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
scripts/commandline.inc
View File

@ -122,10 +122,8 @@ require_once INSTALLDIR . '/lib/common.php';
set_error_handler('common_error_handler'); set_error_handler('common_error_handler');
function have_option($opt, $alt=null) function _make_matches($opt, $alt)
{ {
global $options;
$matches = array(); $matches = array();
if (strlen($opt) > 1 && 0 != strncmp($opt, '--', 2)) { if (strlen($opt) > 1 && 0 != strncmp($opt, '--', 2)) {
@ -142,6 +140,15 @@ function have_option($opt, $alt=null)
} }
} }
return $matches;
}
function have_option($opt, $alt=null)
{
global $options;
$matches = _make_matches($opt, $alt);
foreach ($options as $option) { foreach ($options as $option) {
if (in_array($option[0], $matches)) { if (in_array($option[0], $matches)) {
return true; return true;
@ -151,25 +158,11 @@ function have_option($opt, $alt=null)
return false; return false;
} }
function get_option_value($str, $alt=null) function get_option_value($opt, $alt=null)
{ {
global $options; global $options;
$matches = array(); $matches = _make_matches($opt, $alt);
if (strlen($opt) > 1 && 0 != strncmp($opt, '--', 2)) {
$matches[] = '--'.$opt;
} else {
$matches[] = $opt;
}
if (!empty($alt)) {
if (strlen($alt) > 1 && 0 != strncmp($alt, '--', 2)) {
$matches[] = '--'.$alt;
} else {
$matches[] = $alt;
}
}
foreach ($options as $option) { foreach ($options as $option) {
if (in_array($option[0], $matches)) { if (in_array($option[0], $matches)) {