fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 03:32:00 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug that form validator can't display some error message

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9309 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
taggon 2011-09-23 07:18:21 +00:00
parent 0d3ca55707
commit 86777cf4f7
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/validator/Validator.class.php
View file

@ -478,7 +478,7 @@ class Validator
// error messages // error messages
foreach($lang->filter as $key=>$text) { foreach($lang->filter as $key=>$text) {
if($text) { if($text) {
$text = addslashes($text); $text = preg_replace('@\r?\n@', '\\n', addslashes($text));
$messages[] = "v.cast('ADD_MESSAGE',['{$key}','{$text}']);"; $messages[] = "v.cast('ADD_MESSAGE',['{$key}','{$text}']);";
} }
} }

4
classes/xml/XmlJsFilter.class.php
View file

@ -241,7 +241,8 @@
for($i=0;$i<$target_count;$i++) { for($i=0;$i<$target_count;$i++) {
$target = $target_list[$i]; $target = $target_list[$i];
if(!$lang->{$target}) $lang->{$target} = $target; if(!$lang->{$target}) $lang->{$target} = $target;
$js_messages[] = sprintf("v.cast('ADD_MESSAGE',['%s','%s']);", $target, addslashes($lang->{$target})); $text = preg_replace('@\r?\n@', '\\n', addslashes($lang->{$target}));
$js_messages[] = "v.cast('ADD_MESSAGE',['{$target}','{$text}']);";
} }
// writes the target type // writes the target type
@ -257,6 +258,7 @@
// writes error messages // writes error messages
foreach($lang->filter as $key => $val) { foreach($lang->filter as $key => $val) {
if(!$val) $val = $key; if(!$val) $val = $key;
$val = preg_replace('@\r?\n@', '\\n', addslashes($val));
$js_messages[] = sprintf("v.cast('ADD_MESSAGE',['%s','%s']);", $key, $val); $js_messages[] = sprintf("v.cast('ADD_MESSAGE',['%s','%s']);", $key, $val);
} }