diff options
| author | alecpl <alec@alec.pl> | 2012-04-13 08:52:02 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2012-04-13 08:52:02 +0000 |
| commit | 0c259682f65eaaf23ea4ccb56a706d6baf3007e4 (patch) | |
| tree | f1491f39189c8a970e7612b9dcc20f9409d7361e /program/include/clisetup.php | |
| parent | ce64332e7a9bf2468eabdb4b789270aebb3e7dc7 (diff) | |
- Merge devel-framework branch, resolved conflicts
Diffstat (limited to 'program/include/clisetup.php')
| -rw-r--r-- | program/include/clisetup.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/program/include/clisetup.php b/program/include/clisetup.php index c5f8dd1cc..22ffbbc92 100644 --- a/program/include/clisetup.php +++ b/program/include/clisetup.php @@ -55,7 +55,7 @@ function get_opt($aliases=array()) continue; $args[$key] = preg_replace(array('/^["\']/', '/["\']$/'), '', $value); - + if ($alias = $aliases[$key]) $args[$alias] = $args[$key]; } |