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

Fix coding style violations related to function calls

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-09-22 21:00:47 +10:00
parent 7a2b16dc30
commit 45c05e3ad6
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
export.php
View File

@ -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();

7
libraries/DisplayResults.class.php
View File

@ -1189,10 +1189,9 @@ class PMA_DisplayResults
// See if this column should get highlight because it's used in the
// where-query.
$condition_field = (isset($highlight_columns[$fields_meta[$i]->name])
|| isset(
$highlight_columns[PMA_Util::backquote($fields_meta[$i]->name)])
)
$name = $fields_meta[$i]->name;
$condition_field = (isset($highlight_columns[$name])
|| isset($highlight_columns[PMA_Util::backquote($name)]))
? true
: false;

2
normalization.php
View File

@ -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) {

8
server_privileges.php
View File

@ -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

2
test/libraries/PMA_relation_cleanup_test.php
View File

@ -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) {

2
test/libraries/PMA_server_privileges_test.php
View File

@ -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' "