aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2008-10-15 20:58:36 +0000
committerpatdenice <patdenice@piwigo.org>2008-10-15 20:58:36 +0000
commit3e49cf5f56cfb64e1f3b00cecda8868f6b43f72f (patch)
tree29641a82ce9f4418e8d87e3e73dd27c9bc5648ba /include
parent478291598f09d2055c72b3ff49d6a622e7648f40 (diff)
Merge from trunk 2752:
- change mysql_escape_string function (deprecated) by mysql_real_escape_string. - Correction on install.tpl (link color). git-svn-id: http://piwigo.org/svn/branches/2.0@2753 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-rw-r--r--include/functions_user.inc.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php
index 472487342..02aa2a5d8 100644
--- a/include/functions_user.inc.php
+++ b/include/functions_user.inc.php
@@ -115,7 +115,7 @@ SELECT MAX('.$conf['user_fields']['id'].') + 1
$insert =
array(
$conf['user_fields']['id'] => $next_id,
- $conf['user_fields']['username'] => mysql_escape_string($login),
+ $conf['user_fields']['username'] => mysql_real_escape_string($login),
$conf['user_fields']['password'] => $conf['pass_convert']($password),
$conf['user_fields']['email'] => $mail_address
);
@@ -716,7 +716,7 @@ function get_userid($username)
{
global $conf;
- $username = mysql_escape_string($username);
+ $username = mysql_real_escape_string($username);
$query = '
SELECT '.$conf['user_fields']['id'].'