From 07b95dc49b31d131b1fecdabf2059a447935c196 Mon Sep 17 00:00:00 2001 From: thomascube Date: Sun, 6 Feb 2011 22:21:23 +0000 Subject: Delegate contact input validation to rcube_addressbook instance; accept already localized texts in rcube_output::show_message() --- program/include/rcube_json_output.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'program/include/rcube_json_output.php') diff --git a/program/include/rcube_json_output.php b/program/include/rcube_json_output.php index c6d3c25f9..d1c9de279 100644 --- a/program/include/rcube_json_output.php +++ b/program/include/rcube_json_output.php @@ -170,11 +170,8 @@ class rcube_json_output { 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); } } -- cgit v1.2.3