Imported Upstream version 0.5.4+dfsg

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

diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 8d73b6f16d111e2debef590a2ce9e4cf1665f74a..db1dfc2c2682a8aa2b85b48f4c266bdfa4b76d45 100755 (executable)
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -249,11 +249,16 @@ class rcube_template extends rcube_html_page
     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);
         }
     }