From d61fd77d83926d892645a15e00c3443d2a8a6368 Mon Sep 17 00:00:00 2001 From: alec Date: Fri, 13 Apr 2012 08:52:02 +0000 Subject: - Merge devel-framework branch, resolved conflicts git-svn-id: https://svn.roundcube.net/trunk@6073 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/clisetup.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roundcubemail/program/include/clisetup.php') 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]; } -- cgit v1.2.3