merge from branch luminous (version 1.5.4.2, ~r12561)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions

View file

@ -239,7 +239,13 @@ class Validator
$value = $exists ? $fields[$fname] : null;
}
if(is_array($value)) $value = implode('', $value);
if(is_array($value)) {
if(!isset($value[tmp_name])){
$value = implode('', $value);
}else{
$value = $value['name'];
}
}
// conditional statement
foreach($filter['if'] as $cond) {