Make PHPCS happy.
Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
This commit is contained in:
parent
5d008acb33
commit
5a7d7fb3ab
@ -408,7 +408,7 @@ if (!defined('TESTSUITE')) {
|
||||
// Will we need relation & co. setup?
|
||||
$do_relation = isset($GLOBALS[$what . '_relation']);
|
||||
$do_comments = isset($GLOBALS[$what . '_include_comments'])
|
||||
|| isset($GLOBALS[$what . '_comments']) ;
|
||||
|| isset($GLOBALS[$what . '_comments']);
|
||||
$do_mime = isset($GLOBALS[$what . '_mime']);
|
||||
if ($do_relation || $do_comments || $do_mime) {
|
||||
$cfgRelation = PMA_getRelationsParam();
|
||||
|
||||
@ -106,7 +106,7 @@ if (isset($_REQUEST['step1'])) {
|
||||
} else if (isset($_REQUEST['step3'])) {
|
||||
$res = PMA_getHtmlContentsFor1NFStep3($db, $table);
|
||||
$response->addJSON($res);
|
||||
} else if (isset ($_REQUEST['step4'])) {
|
||||
} else if (isset($_REQUEST['step4'])) {
|
||||
$res = PMA_getHtmlContentsFor1NFStep4($db, $table);
|
||||
$response->addJSON($res);
|
||||
} else if (isset($_REQUEST['step']) && $_REQUEST['step'] == 2.1) {
|
||||
|
||||
@ -414,10 +414,10 @@ if (isset($_REQUEST['adduser'])) {
|
||||
);
|
||||
} else if (!empty($routinename)) {
|
||||
$response->addHTML(
|
||||
PMA_getHtmlForRoutineSpecificPrivilges(
|
||||
$username, $hostname, $dbname, $routinename,
|
||||
(isset($url_dbname) ? $url_dbname : '')
|
||||
)
|
||||
PMA_getHtmlForRoutineSpecificPrivilges(
|
||||
$username, $hostname, $dbname, $routinename,
|
||||
(isset($url_dbname) ? $url_dbname : '')
|
||||
)
|
||||
);
|
||||
} else {
|
||||
// A user was selected -> display the user's properties
|
||||
|
||||
@ -387,7 +387,7 @@ class DBI_PMA_Relation_Cleanup extends PMA_DatabaseInterface
|
||||
}
|
||||
|
||||
if (/*overload*/mb_stripos($sql, "table_info") !== false) {
|
||||
unset ($this->values[$this->indexs['table_info']]);
|
||||
unset($this->values[$this->indexs['table_info']]);
|
||||
}
|
||||
|
||||
if (/*overload*/mb_stripos($sql, "table_coords") !== false) {
|
||||
|
||||
@ -637,7 +637,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
|
||||
list($create_user_real, $create_user_show, $real_sql_query, $sql_query)
|
||||
= PMA_getSqlQueriesForDisplayAndAddUser(
|
||||
$username, $hostname,
|
||||
(isset ($password) ? $password : '')
|
||||
(isset($password) ? $password : '')
|
||||
);
|
||||
$this->assertEquals(
|
||||
"CREATE USER 'pma_username'@'pma_hostname' "
|
||||
|
||||
Loading…
Reference in New Issue
Block a user