Merge branch 'g5'

This commit is contained in:
chicpro
2014-03-04 17:40:44 +09:00

View File

@ -1883,10 +1883,7 @@ function convert_charset($from_charset, $to_charset, $str)
function escape_trim($field)
{
if ($field) {
$str = mysql_real_escape_string(@trim($field));
//if(PHP_VERSION < '5.3.0')
// $str = stripslashes($str);
$str = call_user_func(G5_ESCAPE_FUNCTION, $field);
return $str;
}