Imported Upstream version 0.5.4+dfsg

[roundcube.git] / program / include / rcube_json_output.php

diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php
index c19a68bcdf85629424b9058e9f1a483db1a220ef..7da8d5ad1fe8c7d28666ad8a14ab6cf098dd3d21 100644 (file)
--- a/program/include/rcube_json_output.php
+++ b/program/include/rcube_json_output.php
@@ -169,12 +169,16 @@ class rcube_json_output
     public function show_message($message, $type='notice', $vars=null, $override=true)
     {
         if ($override || !$this->message) {
+            if (rcube_label_exists($message)) {
+                if (!empty($vars))
+                    $vars = array_map('Q', $vars);
+                $msgtext = rcube_label(array('name' => $message, 'vars' => $vars));
+            }
+            else
+                $msgtext = $message;
+
             $this->message = $message;
-            $this->command(
-                'display_message',
-                rcube_label(array('name' => $message, 'vars' => $vars)),
-                $type
-            );
+            $this->command('display_message', $msgtext, $type, $timeout * 1000);
         }
     }