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

2013-10-06 12:07:06 +09:00
parent c40457c1cf 6b196d7b04
commit ee1923d558
16 changed files with 296 additions and 286 deletions
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -1879,7 +1879,12 @@ function convert_charset($from_charset, $to_charset, $str)
 function escape_trim($field)
 {
    if ($field) {
-        return mysql_real_escape_string(@trim($field));
+        $str = mysql_real_escape_string(@trim($field));
+
+        if(PHP_VERSION < '5.3.0')
+            $str = stripslashes($str);
+
+        return $str;
    }
 }