bug #3177136 [interface] Indicate that bookmark is being used on browse.
This commit is contained in:
@@ -136,6 +136,7 @@
|
||||
- patch #3172172 [interface] Shortcut for copying table row.
|
||||
- bug #3175227 [auth] Reset user cache on login.
|
||||
- rfe #3148361 [interface] Replace hard coded limit with $cfg['LimitChars'].
|
||||
- bug #3177136 [interface] Indicate that bookmark is being used on browse.
|
||||
|
||||
3.3.10.0 (not yet released)
|
||||
- patch #3147400 [structure] Aria table size printed as unknown,
|
||||
|
@@ -958,6 +958,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($GLOBALS['using_bookmark_message'])) {
|
||||
$GLOBALS['using_bookmark_message']->display();
|
||||
unset($GLOBALS['using_bookmark_message']);
|
||||
}
|
||||
|
||||
// Corrects the tooltip text via JS if required
|
||||
// @todo this is REALLY the wrong place to do this - very unexpected here
|
||||
if (! $is_view && strlen($GLOBALS['table']) && $cfg['ShowTooltip']) {
|
||||
|
2
sql.php
2
sql.php
@@ -124,6 +124,8 @@ if (empty($sql_query) && strlen($table) && strlen($db)) {
|
||||
'label');
|
||||
|
||||
if (! empty($book_sql_query)) {
|
||||
$GLOBALS['using_bookmark_message'] = PMA_message::notice(__('Using bookmark "%s" as default browse query'));
|
||||
$GLOBALS['using_bookmark_message']->addParam($table);
|
||||
$sql_query = $book_sql_query;
|
||||
} else {
|
||||
$sql_query = 'SELECT * FROM ' . PMA_backquote($table);
|
||||
|
Reference in New Issue
Block a user