Merge branch 'QA_4_9' into QA_5_0

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
phpmyadmin · Nov 4, 2019 · e0ee0f8 · e0ee0f8
2 parents 057118c + 89f311b
commit e0ee0f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -59,6 +59,7 @@ phpMyAdmin - ChangeLog
 - issue #15236 Support phpunit 8 in our test suite to help packaging phpMyAdmin on Debian
 - issue #15522 Fix missing image error fills logs, removed ic_b_info icon from icon list
 - issue #15537 Fixed some issues with the sort by key selectors
+- issue #15546 Fix operators precedence in DatabaseInterface class
 
 4.9.1 (2019-09-20)
 - issue #15313 Added support for Twig 2

diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
@@ -324,7 +324,7 @@ public function tryQuery(
             $this->_dbgQuery($query, $link, $result, $time);
             if ($GLOBALS['cfg']['DBG']['sqllog']) {
                 $warningsCount = '';
-                if ($options & DatabaseInterface::QUERY_STORE == DatabaseInterface::QUERY_STORE) {
+                if (($options & DatabaseInterface::QUERY_STORE) == DatabaseInterface::QUERY_STORE) {
                     if (isset($this->_links[$link]->warning_count)) {
                         $warningsCount = $this->_links[$link]->warning_count;
                     }