Delegate contact input validation to rcube_addressbook instance; accept already localized texts in rcube_output::show_message()

git-svn-id: https://svn.roundcube.net/trunk@4498 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 2 insertions, 4 deletions

diff --git a/roundcubemail/program/include/rcube_template.php b/roundcubemail/program/include/rcube_template.php
index 2102aaa1f..70c175a98 100755
--- a/roundcubemail/program/include/rcube_template.php
+++ b/roundcubemail/program/include/rcube_template.php
@@ -255,10 +255,8 @@ class rcube_template extends rcube_html_page
     {
         if ($override || !$this->message) {
             $this->message = $message;
-            $this->command(
-                'display_message',
-                rcube_label(array('name' => $message, 'vars' => $vars)),
-                $type);
+            $msgtext = rcube_label_exists($message) ? rcube_label(array('name' => $message, 'vars' => $vars)) : $message;
+            $this->command('display_message', $msgtext, $type);
         }
     }