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

bug 824958 bookmarks not configured

Browse Source
This commit is contained in:
Marc Delisle
2003-10-17 18:38:56 +00:00
parent bdb036de03
commit f952077b62
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $Source$
2003-10-17 Marc Delisle <lem9@users.sourceforge.net>
* browse_foreigners.php3: bug 825473: PMA_jsFormat() needed on alert()
* tbl_query_box.php3, libraries/bookmark.lib.php3:
bug 824958: bookmarks not configured
2003-10-16 Michal Cihar <nijel@users.sourceforge.net>
* libraries/zip.lib.php3: Calculate offset progressively (patch #824122).

5
libraries/bookmark.lib.php3
View File

@@ -91,6 +91,11 @@ if (!defined('PMA_BOOKMARK_LIB_INCLUDED')) {
*/
function PMA_queryBookmarks($db, $cfgBookmark, $id, $id_field = 'id')
{
if (empty($cfgBookmark['db']) || empty($cfgBookmark['table'])) {
return '';
}
$query = 'SELECT query FROM ' . PMA_backquote($cfgBookmark['db']) . '.' . PMA_backquote($cfgBookmark['table'])
. ' WHERE dbase = \'' . PMA_sqlAddslashes($db) . '\''
. ' AND (user = \'' . PMA_sqlAddslashes($cfgBookmark['user']) . '\''

9
tbl_query_box.php3
View File

@@ -346,7 +346,14 @@ if (!isset($is_inside_querywindow) || (isset($is_inside_querywindow) && $is_insi
<input type="submit" name="SQL" value="<?php echo $strGo; ?>" />
</td>
<?php
if (!isset($is_inside_querywindow) || isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && $querydisplay_tab != 'history') {
if ( $cfg['Bookmark']['db']
&& $cfg['Bookmark']['table']
&& (!isset($is_inside_querywindow)
|| ( isset($is_inside_querywindow)
&& $is_inside_querywindow == TRUE
&& isset($querydisplay_tab)
//&& $querydisplay_tab != 'history'))) {
&& $querydisplay_tab == 'sql'))) {
?>
<td valign="top">
<input type="submit" name="SQLbookmark" value="<?php echo $strGo . ' &amp; ' . $strBookmarkThis; ?>" />