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

bug #3177136 [interface] Indicate that bookmark is being used on browse.

Browse Source
This commit is contained in:
Michal Čihař
2011-02-10 10:15:07 +01:00
parent 8762386535
commit 69c0a887fc
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -136,6 +136,7 @@
- patch #3172172 [interface] Shortcut for copying table row. - patch #3172172 [interface] Shortcut for copying table row.
- bug #3175227 [auth] Reset user cache on login. - bug #3175227 [auth] Reset user cache on login.
- rfe #3148361 [interface] Replace hard coded limit with $cfg['LimitChars']. - 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) 3.3.10.0 (not yet released)
- patch #3147400 [structure] Aria table size printed as unknown, - patch #3147400 [structure] Aria table size printed as unknown,

5
libraries/common.lib.php
View File

@@ -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 // Corrects the tooltip text via JS if required
// @todo this is REALLY the wrong place to do this - very unexpected here // @todo this is REALLY the wrong place to do this - very unexpected here
if (! $is_view && strlen($GLOBALS['table']) && $cfg['ShowTooltip']) { if (! $is_view && strlen($GLOBALS['table']) && $cfg['ShowTooltip']) {

2
sql.php
View File

@@ -124,6 +124,8 @@ if (empty($sql_query) && strlen($table) && strlen($db)) {
'label'); 'label');
if (! empty($book_sql_query)) { 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; $sql_query = $book_sql_query;
} else { } else {
$sql_query = 'SELECT * FROM ' . PMA_backquote($table); $sql_query = 'SELECT * FROM ' . PMA_backquote($table);