gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor PMA_updateDataForDBInfo, moving parameter into function

Browse Source
This commit is contained in:
xmujay 2013-08-10 20:14:29 +08:00
parent 990f4fb126
commit e50d16eb20
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libraries/server_privileges.lib.php
View File

@ -3269,18 +3269,20 @@ function PMA_updateDataForAddUser(
/**
* Update DB information: DB, Table, isWildcard
*
* @param string &$dbname database name
* @param string &$tablename table name
* @param string &$db_and_table db_and_table
* @param bool &$dbname_is_wildcard is Wild card
* @param string &$pred_dbname Pre database name
* @param string $dbname database name
* @param string $tablename table name
* @param string $db_and_table db_and_table
* @param bool $dbname_is_wildcard is Wild card
*
* @return null
* @return array
*/
function PMA_updateDataForDBInfo(
&$dbname, &$tablename, &$db_and_table,
&$dbname_is_wildcard, &$pred_dbname
) {
$dbname = null;
$tablename = null;
$db_and_table = null;
$dbname_is_wildcard = null;
/**
* Checks if a dropdown box has been used for selecting a database / table
*/
@ -3323,6 +3325,13 @@ function PMA_updateDataForDBInfo(
$dbname_is_wildcard = false;
}
}
return array(
isset($dbname)? $dbname : null,
isset($tablename)? $tablename : null,
isset($db_and_table)? $db_and_table : null,
isset($dbname_is_wildcard)? $dbname_is_wildcard : null,
);
}
/**

10
server_privileges.php
View File

@ -122,15 +122,9 @@ $strPrivDescUsage = __('No privileges.');
/**
* Get DB information: dbname, tablename, db_and_table, dbname_is_wildcard
*/
$dbname = isset($dbname)? $dbname : null;
$tablename = isset($tablename)? $tablename : null;
$db_and_table = isset($db_and_table)? $db_and_table : null;
$dbname_is_wildcard = isset($dbname_is_wildcard)? $dbname_is_wildcard : null;
$pred_dbname = isset($pred_dbname)? $pred_dbname : null;
PMA_updateDataForDBInfo(
$dbname, $tablename, $db_and_table, $dbname_is_wildcard, $pred_dbname
);
list($dbname, $tablename, $db_and_table, $dbname_is_wildcard)
= PMA_updateDataForDBInfo();
/**
* Checks if the user is allowed to do what he tries to...