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

patch #1605032, undefined index

Browse Source
This commit is contained in:
Marc Delisle
2006-11-29 11:04:16 +00:00
parent 883eea7a79
commit 5dd2f3696d
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -7,6 +7,8 @@ $HeadURL$
2006-11-29 Marc Delisle <lem9@users.sourceforge.net> 2006-11-29 Marc Delisle <lem9@users.sourceforge.net>
* lang/spanish update, thanks to Daniel Hinostroza * lang/spanish update, thanks to Daniel Hinostroza
* sql.php, libraries/display_tbl.lib.php: patch #1605032, checks for
undefined index, thanks to Arpad Borsos
2006-11-26 Marc Delisle <lem9@users.sourceforge.net> 2006-11-26 Marc Delisle <lem9@users.sourceforge.net>
* tbl_structure.php: bug #1602335, browse distinct values * tbl_structure.php: bug #1602335, browse distinct values

2
libraries/display_tbl.lib.php
View File

@@ -1106,7 +1106,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
} }
} // end if (1.2.1) } // end if (1.2.1)
if ($table == $GLOBALS['cfg']['Bookmark']['table'] && $db == $GLOBALS['cfg']['Bookmark']['db'] && isset($row[1]) && isset($row[0])) { if (isset($GLOBALS['cfg']['Bookmark']['table']) && isset($GLOBALS['cfg']['Bookmark']['db']) && $table == $GLOBALS['cfg']['Bookmark']['table'] && $db == $GLOBALS['cfg']['Bookmark']['db'] && isset($row[1]) && isset($row[0])) {
$bookmark_go = '<a href="import.php?' $bookmark_go = '<a href="import.php?'
. PMA_generate_common_url($row[1], '') . PMA_generate_common_url($row[1], '')
. '&amp;id_bookmark=' . $row[0] . '&amp;id_bookmark=' . $row[0]

4
sql.php
View File

@@ -745,9 +745,9 @@ else {
} }
} // End INDEX CHECK } // End INDEX CHECK
// Bookmark Support if required // Bookmark support if required
if ($disp_mode[7] == '1' if ($disp_mode[7] == '1'
&& (isset($cfg['Bookmark']) && $cfg['Bookmark']['db'] && $cfg['Bookmark']['table'] && empty($id_bookmark)) && (isset($cfg['Bookmark']) && ! empty($cfg['Bookmark']['db']) && ! empty($cfg['Bookmark']['table']) && empty($id_bookmark))
&& !empty($sql_query)) { && !empty($sql_query)) {
echo "\n"; echo "\n";