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

Merge branch 'QA_3_3'

Browse Source
This commit is contained in:
Michal Čihař
2011-02-11 14:23:54 +01:00
parent 6a65332a3c de17abec0d
commit e9bac1dfbb
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/bookmark.lib.php
View File

@@ -104,12 +104,13 @@ function PMA_Bookmark_getList($db)
* @param mixed the id of the bookmark to get
* @param string which field to look up the $id
* @param boolean TRUE: get all bookmarks regardless of the owning user
* @param boolean whether to ignore bookmarks with no user
*
* @return string the sql query
*
* @access public
*/
function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = FALSE)
function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = FALSE, $exact_user_match = FALSE)
{
global $controllink;
@@ -120,10 +121,18 @@ function PMA_Bookmark_get($db, $id, $id_field = 'id', $action_bookmark_all = FAL
}
$query = 'SELECT query FROM ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
. ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\''
. ($action_bookmark_all? '' : ' AND (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\''
. ' OR user = \'\')')
. ' AND ' . PMA_backquote($id_field) . ' = ' . $id;
. ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\'';
if (!$action_bookmark_all) {
$query .= ' AND (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\'';
if (!$exact_user_match) {
$query .= ' OR user = \'\'';
}
$query .= ')';
}
$query .= ' AND ' . PMA_backquote($id_field) . ' = ' . $id;
return PMA_DBI_fetch_value($query, 0, 0, $controllink);
} // end of the 'PMA_Bookmark_get()' function

2
sql.php
View File

@@ -121,7 +121,7 @@ if(isset($_REQUEST['get_enum_values']) && $_REQUEST['get_enum_values'] == true)
if (empty($sql_query) && strlen($table) && strlen($db)) {
require_once './libraries/bookmark.lib.php';
$book_sql_query = PMA_Bookmark_get($db, '\'' . PMA_sqlAddslashes($table) . '\'',
'label');
'label', FALSE, TRUE);
if (! empty($book_sql_query)) {
$GLOBALS['using_bookmark_message'] = PMA_message::notice(__('Using bookmark "%s" as default browse query.'));