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

Fix coding style

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2014-06-30 11:10:00 -04:00
parent d6d6e31d7a
commit 8e2f307279
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libraries/bookmark.lib.php
View File

@ -65,7 +65,7 @@ function PMA_Bookmark_getList($db = false)
}
$ret = Array();
if($db !== false) {
if ($db !== false) {
$query = 'SELECT label, id FROM ' . PMA_Util::backquote($cfgBookmark['db'])
. '.' . PMA_Util::backquote($cfgBookmark['table'])
. ' WHERE dbase = \'' . PMA_Util::sqlAddSlashes($db) . '\''
@ -92,20 +92,31 @@ function PMA_Bookmark_getList($db = false)
asort($ret);
} else {
$query = 'SELECT label, id, query, dbase FROM ' . PMA_Util::backquote($cfgBookmark['db'])
$query = 'SELECT label, id, query, dbase FROM '
. PMA_Util::backquote($cfgBookmark['db'])
. '.' . PMA_Util::backquote($cfgBookmark['table'])
. ' WHERE user = \'' . PMA_Util::sqlAddSlashes($cfgBookmark['user']) . '\''
. ' WHERE user = \''
. PMA_Util::sqlAddSlashes($cfgBookmark['user']) . '\''
. ' ORDER BY label';
$per_user = $GLOBALS['dbi']->fetchResult(
$query, Array('id', 'label', 'dbase'), 'query', $controllink, PMA_DatabaseInterface::QUERY_STORE
$query,
Array('id', 'label', 'dbase'),
'query',
$controllink,
PMA_DatabaseInterface::QUERY_STORE
);
$query = 'SELECT label, id, query, dbase FROM ' . PMA_Util::backquote($cfgBookmark['db'])
$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
$query,
Array('id', 'label', 'dbase'),
'query',
$controllink,
PMA_DatabaseInterface::QUERY_STORE
);
$ret = Array();