diff --git a/ChangeLog b/ChangeLog index c0214cb0d..1f5d105df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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, diff --git a/libraries/common.lib.php b/libraries/common.lib.php index c8d4290e5..35ddeee0a 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -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']) { diff --git a/sql.php b/sql.php index 8a0529878..fd6ca678c 100644 --- a/sql.php +++ b/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);