summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-04-26 17:02:13 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-04-26 17:02:13 +0000
commit335c951718ec32ff1e39f50c8d4c605fed8521e8 (patch)
treef8e8a4e4ae0b8da8252a996a74b34b039c841792
parent52720735d7192e84674a46b25f51c8621f84cb7e (diff)
Fix adding labels from plugins
git-svn-id: https://svn.roundcube.net/trunk@2429 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/program/include/rcube_json_output.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/roundcubemail/program/include/rcube_json_output.php b/roundcubemail/program/include/rcube_json_output.php
index a14f4ae14..7c79157fd 100644
--- a/roundcubemail/program/include/rcube_json_output.php
+++ b/roundcubemail/program/include/rcube_json_output.php
@@ -130,8 +130,11 @@ class rcube_json_output
*/
public function add_label()
{
- $arg_list = func_get_args();
- foreach ($arg_list as $i => $name) {
+ $args = func_get_args();
+ if (count($args) == 1 && is_array($args[0]))
+ $args = $args[0];
+
+ foreach ($args as $name) {
$this->texts[$name] = rcube_label($name);
}
}