Merge pull request #18719 from kamil-tekiela/deletebookmark52

MauricioFauth · web-flow · commit 748d489dacaf · 2023-09-18T20:51:11.000-03:00
Fix bookmark delete
diff --git a/libraries/classes/Bookmark.php b/libraries/classes/Bookmark.php
@@ -305,7 +305,12 @@ public static function get(
 
         $query = 'SELECT * FROM ' . Util::backquote($bookmarkFeature->database)
             . '.' . Util::backquote($bookmarkFeature->bookmark)
-            . " WHERE dbase = '" . $dbi->escapeString($db) . "'";
+            . ' WHERE ' . Util::backquote($id_field)
+            . " = '" . $dbi->escapeString((string) $id) . "'";
+        if ($db !== '') {
+            $query .= " AND dbase = '" . $dbi->escapeString($db) . "'";
+        }
+
         if (! $action_bookmark_all) {
             $query .= " AND (user = '"
                 . $dbi->escapeString($user) . "'";
@@ -316,8 +321,7 @@ public static function get(
             $query .= ')';
         }
 
-        $query .= ' AND ' . Util::backquote($id_field)
-            . " = '" . $dbi->escapeString((string) $id) . "' LIMIT 1";
+        $query .= ' LIMIT 1';
 
         $result = $dbi->fetchSingleRow($query, DatabaseInterface::FETCH_ASSOC, DatabaseInterface::CONNECT_CONTROL);
         if (! empty($result)) {
diff --git a/test/classes/Stubs/DbiDummy.php b/test/classes/Stubs/DbiDummy.php
@@ -2495,8 +2495,8 @@ private function init(): void
                 'result' => [],
             ],
             [
-                'query' => 'SELECT * FROM `information_schema`.`bookmark` WHERE dbase = \'my_db\''
-                . ' AND (user = \'user\') AND `label` = \'test_tbl\' LIMIT 1',
+                'query' => 'SELECT * FROM `information_schema`.`bookmark` WHERE `label` = \'test_tbl\''
+                . ' AND dbase = \'my_db\' AND (user = \'user\') LIMIT 1',
                 'result' => [],
             ],
             [

Original file line number	Diff line number	Diff line change
`@@ -2495,8 +2495,8 @@ private function init(): void`
`2495`	`2495`	`'result' => [],`
`2496`	`2496`	`],`
`2497`	`2497`	`[`
`2498`		- 'query' => 'SELECT * FROM `information_schema`.`bookmark` WHERE dbase = \'my_db\''
`2499`		- . ' AND (user = \'user\') AND `label` = \'test_tbl\' LIMIT 1',
	`2498`	+ 'query' => 'SELECT * FROM `information_schema`.`bookmark` WHERE `label` = \'test_tbl\''
	`2499`	`+ . ' AND dbase = \'my_db\' AND (user = \'user\') LIMIT 1',`
`2500`	`2500`	`'result' => [],`
`2501`	`2501`	`],`
`2502`	`2502`	`[`