diff --git a/js/src/designer/move.js b/js/src/designer/move.js index 1788894b34..98e8a547ab 100644 --- a/js/src/designer/move.js +++ b/js/src/designer/move.js @@ -1938,7 +1938,7 @@ DesignerMove.enablePageContentEvents = function () { $(document).on('mousedown', function (e) { DesignerMove.mouseDown(e); }); - $(document).on('mouseup', function (e) { + $(document).on('mouseup', function () { DesignerMove.mouseUp(); }); $(document).on('mousemove', function (e) { diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php index 5586176a72..b3e170ab8e 100644 --- a/libraries/classes/Normalization.php +++ b/libraries/classes/Normalization.php @@ -1056,7 +1056,7 @@ class Normalization continue; } - $result[$column] = (int) $res[0][$column . '_cnt']; + $result[$column] = (int) ($res[0][$column . '_cnt'] ?? null); } return $result; diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php index 5d925a4f5c..f5c9ffbef5 100644 --- a/test/classes/Stubs/DbiDummy.php +++ b/test/classes/Stubs/DbiDummy.php @@ -1368,7 +1368,7 @@ class DbiDummy implements DbiExtension ], [ 'query' => 'SELECT COUNT(*) FROM `pma_test`.`table1`', - 'result' => [[0]], + 'result' => [], ], [ 'query' => 'SELECT `PRIVILEGE_TYPE` FROM `INFORMATION_SCHEMA`.'