Merge branch 'master' of github.com:gnuboard/g5 into g5

This commit is contained in:
chicpro committed 2014-04-24 11:30:45 +09:00
commit dc48ee06a8
1 file changed
+3 -7
+3 -7
View File
@@ -1927,17 +1927,13 @@ function sql_real_escape_string($field)
{
global $g5;
if($field != '')
return mysql_real_escape_string($field, $g5['connect_db']);
return mysql_real_escape_string($field, $g5['connect_db']);
}
function escape_trim($field)
{
if ($field) {
$str = call_user_func(G5_ESCAPE_FUNCTION, $field);
return $str;
}
$str = call_user_func(G5_ESCAPE_FUNCTION, $field);
return $str;
}