diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-04-13 08:52:02 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-04-13 08:52:02 +0000 |
| commit | d61fd77d83926d892645a15e00c3443d2a8a6368 (patch) | |
| tree | 83ede4b27294a42a45ee988751f51182994e0de7 /roundcubemail/program/include/clisetup.php | |
| parent | 8a3df3f032059464ebaab2dde26ab0d24b186572 (diff) | |
- Merge devel-framework branch, resolved conflicts
git-svn-id: https://svn.roundcube.net/trunk@6073 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/clisetup.php')
| -rw-r--r-- | roundcubemail/program/include/clisetup.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roundcubemail/program/include/clisetup.php b/roundcubemail/program/include/clisetup.php index c5f8dd1cc..22ffbbc92 100644 --- a/roundcubemail/program/include/clisetup.php +++ b/roundcubemail/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]; } |