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

message "Bookmark created" is not displaying

Browse Source
This commit is contained in:
Marc Delisle
2009-01-24 16:43:56 +00:00
parent 612d719787
commit 693e9e9007
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -12,6 +12,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2027720 [parser] Missing space after BINARY used as cast - bug #2027720 [parser] Missing space after BINARY used as cast
- patch #2520747 [core] E_DEPRECATED compatibility for PHP 5.3, - patch #2520747 [core] E_DEPRECATED compatibility for PHP 5.3,
thanks to Giovanni Giacobbi - themnemonic thanks to Giovanni Giacobbi - themnemonic
- bug [display] Message "Bookmark created" is not displaying
3.1.2.0 (2009-01-19) 3.1.2.0 (2009-01-19)
- bug #1253252 [display] Can't NULL a column with relation defined - bug #1253252 [display] Can't NULL a column with relation defined

4
libraries/common.lib.php
View File

@@ -1020,6 +1020,10 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice')
echo '<div align="' . $GLOBALS['cell_align_left'] . '">' . "\n"; echo '<div align="' . $GLOBALS['cell_align_left'] . '">' . "\n";
if ($message instanceof PMA_Message) { if ($message instanceof PMA_Message) {
if (isset($GLOBALS['special_message'])) {
$message->addMessage($GLOBALS['special_message']);
unset($GLOBALS['special_message']);
}
$message->display(); $message->display();
$type = $message->getLevel(); $type = $message->getLevel();
} else { } else {

11
sql.php
View File

@@ -2,7 +2,7 @@
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/** /**
* @todo we must handle the case if sql.php is called directly with a query * @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$ * @version $Id$
*/ */
@@ -105,7 +105,8 @@ if (isset($find_real_end) && $find_real_end) {
*/ */
if (isset($store_bkm)) { if (isset($store_bkm)) {
PMA_Bookmark_save($fields, (isset($bkm_all_users) && $bkm_all_users == 'true' ? true : false)); 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 &amp; in this case:
PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . $goto . '&label=' . $fields['label']);
} // end if } // end if
/** /**
@@ -617,6 +618,12 @@ else {
$disp_mode = 'nnnn110111'; $disp_mode = 'nnnn110111';
} }
if (isset($label)) {
$message = PMA_message::success('strBookmarkCreated');
$message->addParam($label);
$message->display();
}
PMA_displayTable($result, $disp_mode, $analyzed_sql); PMA_displayTable($result, $disp_mode, $analyzed_sql);
PMA_DBI_free_result($result); PMA_DBI_free_result($result);