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

Fix bookmark delete

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2023-09-16 13:21:44 +01:00
parent 6e695df23d
commit 1c6c661298
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/classes/Bookmark.php
View File

@ -305,7 +305,12 @@ class Bookmark
$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 @@ class Bookmark
$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)) {

4
test/classes/Stubs/DbiDummy.php
View File

@ -2495,8 +2495,8 @@ class DbiDummy implements DbiExtension
'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' => [],
],
[