diff --git a/ChangeLog b/ChangeLog index 83989c233..be29339bf 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $Source$ 2002-07-14 Marc Delisle * Documentation.html, db_details_exports.php3, tbl_properties_export.php3: add a link to a new faq entry explaining some dump options + * libraries/relation.lib.php3: bug 575868 Unitialized string offset 2002-07-13 Marc Delisle * libraries/common.lib.php3: bug 580929: do not EXPLAIN if this is diff --git a/libraries/relation.lib.php3 b/libraries/relation.lib.php3 index 3b1ed6e92..7fa863939 100644 --- a/libraries/relation.lib.php3 +++ b/libraries/relation.lib.php3 @@ -81,10 +81,12 @@ if (!defined('PMA_RELATION_LIB_INCLUDED')){ $cfgRelation['commwork'] = FALSE; // No server selected -> no bookmark table + // we return the array with the FALSEs in it, + // to avoid some 'Unitialized string offset' errors later if ($server == 0 || empty($cfg['Server']) || empty($cfg['Server']['pmadb'])) { - return ''; + return $cfgRelation; } $cfgRelation['user'] = $cfg['Server']['user'];