From b54a5916c912b89b17dfa9d5dfec633350f7254c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 28 Apr 2015 14:05:50 -0400 Subject: [PATCH 1/3] Fix loose comparison Signed-off-by: Marc Delisle --- index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index 13b18eea5f..bb4e12742a 100644 --- a/index.php +++ b/index.php @@ -679,10 +679,10 @@ function PMA_printListItem($name, $listId = null, $url = null, if (null !== $target) { echo ' target="' . $target . '"'; } - if (null != $a_id) { + if (null !== $a_id) { echo ' id="' . $a_id . '"'; } - if (null != $a_class) { + if (null !== $a_class) { echo ' class="' . $a_class . '"'; } echo '>'; From 3cace0f05baf6fbec2773a2bf5b0771b5bd14176 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 28 Apr 2015 14:19:41 -0400 Subject: [PATCH 2/3] Clarify implicit boolean conversion Signed-off-by: Marc Delisle --- tbl_operations.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbl_operations.php b/tbl_operations.php index d0e3a1dc02..efb1e954f5 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -410,7 +410,7 @@ if ($cfgRelation['relwork'] && ! $is_innodb) { $GLOBALS['dbi']->selectDb($GLOBALS['db']); $foreign = PMA_getForeigners($GLOBALS['db'], $GLOBALS['table'], '', 'internal'); - if ($foreign) { + if (! empty($foreign)) { $response->addHTML( PMA_getHtmlForReferentialIntegrityCheck($foreign, $url_params) ); From 7c62dfd79de00a82305b1821e8b1ae68071b20eb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 28 Apr 2015 14:56:37 -0400 Subject: [PATCH 3/3] Make class instance match the class name Signed-off-by: Marc Delisle --- db_qbe.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db_qbe.php b/db_qbe.php index 831e5cd0c3..f027cac32c 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -106,7 +106,7 @@ if ($message_to_display) { unset($message_to_display); // create new qbe search instance -$db_qbe = new PMA_DBQbe($GLOBALS['db'], $savedSearchList, $savedSearch); +$db_qbe = new PMA_DbQbe($GLOBALS['db'], $savedSearchList, $savedSearch); /** * Displays the Query by example form