The branch, master has been updated
via 1b57acfa8b7fb11ec63c474e848069a9bde2b07a (commit)
from ce07c5c78a9a14288455cae6a239f0698e7d3dd9 (commit)
- Log -----------------------------------------------------------------
commit 1b57acfa8b7fb11ec63c474e848069a9bde2b07a
Author: Michal Čihař <[email protected]>
Date: Fri Jul 22 08:53:03 2011 +0200
Remove unused parameter of PMA_wildcardEscapeForGrant and document others
-----------------------------------------------------------------------
Summary of changes:
server_privileges.php | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/server_privileges.php b/server_privileges.php
index 7433c46..a184682 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -134,12 +134,11 @@ $random_n = mt_rand(0,1000000); // a random number that
will be appended to the
* no escaping (for example test_db) but in mysql.db you'll see test\_db
* for a db-specific privilege.
*
- * @param string $db_and_table
- * @param string $dbname
- * @param string $tablename
- * @return string the escaped (if necessary) $db_and_table
+ * @param string $dbname Database name
+ * @param string $tablename Table name
+ * @return string the escaped (if necessary) database.table
*/
-function PMA_wildcardEscapeForGrant($db_and_table, $dbname, $tablename) {
+function PMA_wildcardEscapeForGrant($dbname, $tablename) {
if (! strlen($dbname)) {
$db_and_table = '*.*';
@@ -1106,7 +1105,7 @@ if (isset($_REQUEST['change_copy'])) {
* Updates privileges
*/
if (!empty($update_privs)) {
- $db_and_table = PMA_wildcardEscapeForGrant($db_and_table, $dbname,
(isset($tablename) ? $tablename : ''));
+ $db_and_table = PMA_wildcardEscapeForGrant($dbname, (isset($tablename) ?
$tablename : ''));
$sql_query0 =
'REVOKE ALL PRIVILEGES ON ' . $db_and_table
@@ -1182,7 +1181,7 @@ if (!empty($update_privs)) {
* Revokes Privileges
*/
if (isset($_REQUEST['revokeall'])) {
- $db_and_table = PMA_wildcardEscapeForGrant($db_and_table, $dbname,
isset($tablename) ? $tablename : '');
+ $db_and_table = PMA_wildcardEscapeForGrant($dbname, isset($tablename) ?
$tablename : '');
$sql_query0 =
'REVOKE ALL PRIVILEGES ON ' . $db_and_table
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
10 Tips for Better Web Security
Learn 10 ways to better secure your business today. Topics covered include:
Web security, SSL, hacker attacks & Denial of Service (DoS), private keys,
security Microsoft Exchange, secure Instant Messaging, and much more.
http://www.accelacomm.com/jaw/sfnl/114/51426210/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
