Merge branch 'develop' of github.com:xpressengine/xe-core into develop

This commit is contained in:
bnu 2015-03-30 14:16:12 +09:00
commit f7b3da6f0e

View file

@ -225,6 +225,11 @@ class ExtraItem
$values = explode(',', $value); $values = explode(',', $value);
} }
$values = array_values($values);
for($i = 0, $c = count($values); $i < $c; $i++)
{
$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
}
return $values; return $values;
case 'checkbox' : case 'checkbox' :
@ -247,11 +252,11 @@ class ExtraItem
$values = array($value); $values = array($value);
} }
$values = array_values($values);
for($i = 0, $c = count($values); $i < $c; $i++) for($i = 0, $c = count($values); $i < $c; $i++)
{ {
$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false)); $values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
} }
return $values; return $values;
case 'kr_zip' : case 'kr_zip' :
@ -268,6 +273,11 @@ class ExtraItem
$values = array($value); $values = array($value);
} }
$values = array_values($values);
for($i = 0, $c = count($values); $i < $c; $i++)
{
$values[$i] = trim(htmlspecialchars($values[$i], ENT_COMPAT | ENT_HTML401, 'UTF-8', false));
}
return $values; return $values;
//case 'date' : //case 'date' :