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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-03-23 07:39:15 +01:00
commit 322947ca30
1 changed files with 10 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
libraries/bookmark.lib.php
View File

@ -91,62 +91,20 @@ function PMA_Bookmark_getList($db = false)
asort($ret);
} else {
$query = 'SELECT label, id, query, dbase FROM '
. PMA_Util::backquote($cfgBookmark['db'])
. '.' . PMA_Util::backquote($cfgBookmark['table'])
. ' WHERE user = \''
. PMA_Util::sqlAddSlashes($cfgBookmark['user']) . '\''
. ' ORDER BY label';
$per_user = $GLOBALS['dbi']->fetchResult(
$query = "SELECT `label`, `id`, `query`, `dbase` AS `db`,"
. " IF (`user` = '', true, false) AS `shared`"
. " FROM ". PMA_Util::backquote($cfgBookmark['db'])
. "." . PMA_Util::backquote($cfgBookmark['table'])
. " WHERE `user` = '' OR"
. " `user` = '" . PMA_Util::sqlAddSlashes($cfgBookmark['user']) . "'";
$ret = $GLOBALS['dbi']->fetchResult(
$query,
Array('id', 'label', 'dbase'),
'query',
null,
null,
$controllink,
PMA_DatabaseInterface::QUERY_STORE
);
$query = 'SELECT label, id, query, dbase FROM '
. PMA_Util::backquote($cfgBookmark['db'])
. '.' . PMA_Util::backquote($cfgBookmark['table'])
. ' WHERE user = \'\''
. ' ORDER BY label';
$global = $GLOBALS['dbi']->fetchResult(
$query,
Array('id', 'label', 'dbase'),
'query',
$controllink,
PMA_DatabaseInterface::QUERY_STORE
);
$ret = Array();
foreach ($global as $id => $val) {
foreach ($val as $label => $val2) {
foreach ($val2 as $dbase => $query) {
$ret[] = Array(
'db' => $dbase,
'id' => $id,
'label' => $label,
'query' => $query,
'shared' => true
);
}
}
}
foreach ($per_user as $id => $val) {
foreach ($val as $label => $val2) {
foreach ($val2 as $dbase => $query) {
$ret[] = Array(
'db' => $dbase,
'id' => $id,
'label' => $label,
'query' => $query,
'shared' => false
);
}
}
}
}
return $ret;