[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC1-1714-g0352d27

The branch, master has been updated via 0352d27db7b250c2ed98d203b1559430241ae911 (commit) via 7ebe311433e7396e0623ac6f00fe48d095d2edb7 (commit) via 7c34108612574f750bf93b10f23561744385abac (commit) via 2928a557a737d98afe4f7e1ab682fd330d788cf4 (commit) from c6be70e8a39ed988a4921b483905e6ddd8f0fc00 (commit) - Log ----------------------------------------------------------------- commit 0352d27db7b250c2ed98d203b1559430241ae911 Merge: 7c34108612574f750bf93b10f23561744385abac 7ebe311433e7396e0623ac6f00fe48d095d2edb7 Author: Herman van Rink <rink@initfour.nl> Date: Tue Apr 26 16:30:09 2011 +0200 Merge branch 'QA_3_3' commit 7c34108612574f750bf93b10f23561744385abac Merge: c6be70e8a39ed988a4921b483905e6ddd8f0fc00 2928a557a737d98afe4f7e1ab682fd330d788cf4 Author: Herman van Rink <rink@initfour.nl> Date: Tue Apr 26 16:28:13 2011 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: server_privileges.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server_privileges.php b/server_privileges.php index 02eb82a..09104e1 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -165,8 +165,8 @@ function PMA_RangeOfUsers($initial = '') // strtolower() is used because the User field // might be BINARY, so LIKE would be case sensitive if (!empty($initial)) { - $ret = " WHERE `User` LIKE '" . $initial . "%'" - . " OR `User` LIKE '" . strtolower($initial) . "%'"; + $ret = " WHERE `User` LIKE '" . PMA_sqlAddslashes($initial) . "%'" + . " OR `User` LIKE '" . PMA_sqlAddslashes(strtolower($initial)) . "%'"; } else { $ret = ''; } hooks/post-receive -- phpMyAdmin
participants (1)
-
Herman van Rink