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

2013-10-04 13:28:57 +09:00
parent d5e3dbc115 4be2995c98
commit ad84629fa3
2 changed files with 7 additions and 1 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;
    }
 }

--- a/plugin/okname/key/.htaccess
+++ b/plugin/okname/key/.htaccess
@ -0,0 +1 @@
+# .htaccess