message "Bookmark created" is not displaying
This commit is contained in:
@@ -31,6 +31,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
|
||||
- bug #2027720 [parser] Missing space after BINARY used as cast
|
||||
- patch #2520747 [core] E_DEPRECATED compatibility for PHP 5.3,
|
||||
thanks to Giovanni Giacobbi - themnemonic
|
||||
- bug [display] Message "Bookmark created" is not displaying
|
||||
|
||||
3.1.2.0 (2009-01-19)
|
||||
- bug #1253252 [display] Can't NULL a column with relation defined
|
||||
|
@@ -1025,6 +1025,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice')
|
||||
echo '<div align="' . $GLOBALS['cell_align_left'] . '">' . "\n";
|
||||
|
||||
if ($message instanceof PMA_Message) {
|
||||
if (isset($GLOBALS['special_message'])) {
|
||||
$message->addMessage($GLOBALS['special_message']);
|
||||
unset($GLOBALS['special_message']);
|
||||
}
|
||||
$message->display();
|
||||
$type = $message->getLevel();
|
||||
} else {
|
||||
|
11
sql.php
11
sql.php
@@ -2,7 +2,7 @@
|
||||
/* vim: set expandtab sw=4 ts=4 sts=4: */
|
||||
/**
|
||||
* @todo we must handle the case if sql.php is called directly with a query
|
||||
* what returns 0 rows - to prevent cyclic redirects or includes
|
||||
* that returns 0 rows - to prevent cyclic redirects or includes
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin
|
||||
*/
|
||||
@@ -106,7 +106,8 @@ if (isset($find_real_end) && $find_real_end) {
|
||||
*/
|
||||
if (isset($store_bkm)) {
|
||||
PMA_Bookmark_save($fields, (isset($bkm_all_users) && $bkm_all_users == 'true' ? true : false));
|
||||
PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . $goto);
|
||||
// go back to sql.php to redisplay query; do not use & in this case:
|
||||
PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . $goto . '&label=' . $fields['label']);
|
||||
} // end if
|
||||
|
||||
/**
|
||||
@@ -627,6 +628,12 @@ else {
|
||||
$disp_mode = 'nnnn110111';
|
||||
}
|
||||
|
||||
if (isset($label)) {
|
||||
$message = PMA_message::success('strBookmarkCreated');
|
||||
$message->addParam($label);
|
||||
$message->display();
|
||||
}
|
||||
|
||||
PMA_displayTable($result, $disp_mode, $analyzed_sql);
|
||||
PMA_DBI_free_result($result);
|
||||
|
||||
|
Reference in New Issue
Block a user