From 9e6c5665c9502d14c042f475910c1fb6a5ed2dcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 22 Jun 2004 12:46:24 +0000
Subject: [PATCH] Fix possible error on non existant pma db.

---
 ChangeLog                  |  3 +++
 libraries/relation.lib.php | 39 ++++++++++++++++++++------------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 97c0bdcb8..91401cbff 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-06-22 Michal Čihař  <michal@cihar.com>
+    * libraries/relation.lib.php: Fix possible error on non existant pma db.
+    
 2004-06-20 Marc Delisle  <lem9@users.sourceforge.net>
     * themes.php: use standard headers. A iso-8859-1 charset was hardcoded
       in this script, but it's better to use libraries/header_http.inc.php
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 00fa47587..fcad46ec9 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -31,7 +31,7 @@ error_reporting(E_ALL);
     if ($show_error) {
         $result = PMA_DBI_query($sql, $dbh, $options);
     } else {
-        $result = PMA_DBI_try_query($sql, $dbh, $options);
+        $result = @PMA_DBI_try_query($sql, $dbh, $options);
     } // end if... else...
     PMA_DBI_select_db($db, $dbh);
 
@@ -106,23 +106,26 @@ function PMA_getRelationsParam($verbose = FALSE)
     $tab_query = 'SHOW TABLES FROM ' . PMA_backquote($cfgRelation['db']);
     $tab_rs    = PMA_query_as_cu($tab_query, FALSE, PMA_DBI_QUERY_STORE);
 
-    while ($curr_table = @PMA_DBI_fetch_row($tab_rs)) {
-        if ($curr_table[0] == $cfg['Server']['bookmarktable']) {
-            $cfgRelation['bookmark']        = $curr_table[0];
-        } else if ($curr_table[0] == $cfg['Server']['relation']) {
-            $cfgRelation['relation']        = $curr_table[0];
-        } else if ($curr_table[0] == $cfg['Server']['table_info']) {
-            $cfgRelation['table_info']      = $curr_table[0];
-        } else if ($curr_table[0] == $cfg['Server']['table_coords']) {
-            $cfgRelation['table_coords']    = $curr_table[0];
-        } else if ($curr_table[0] == $cfg['Server']['column_info']) {
-            $cfgRelation['column_info'] = $curr_table[0];
-        } else if ($curr_table[0] == $cfg['Server']['pdf_pages']) {
-            $cfgRelation['pdf_pages']       = $curr_table[0];
-        } else if ($curr_table[0] == $cfg['Server']['history']) {
-            $cfgRelation['history'] = $curr_table[0];
-        }
-    } // end while
+    if ($tab_rs) {
+        while ($curr_table = @PMA_DBI_fetch_row($tab_rs)) {
+            if ($curr_table[0] == $cfg['Server']['bookmarktable']) {
+                $cfgRelation['bookmark']        = $curr_table[0];
+            } else if ($curr_table[0] == $cfg['Server']['relation']) {
+                $cfgRelation['relation']        = $curr_table[0];
+            } else if ($curr_table[0] == $cfg['Server']['table_info']) {
+                $cfgRelation['table_info']      = $curr_table[0];
+            } else if ($curr_table[0] == $cfg['Server']['table_coords']) {
+                $cfgRelation['table_coords']    = $curr_table[0];
+            } else if ($curr_table[0] == $cfg['Server']['column_info']) {
+                $cfgRelation['column_info'] = $curr_table[0];
+            } else if ($curr_table[0] == $cfg['Server']['pdf_pages']) {
+                $cfgRelation['pdf_pages']       = $curr_table[0];
+            } else if ($curr_table[0] == $cfg['Server']['history']) {
+                $cfgRelation['history'] = $curr_table[0];
+            }
+        } // end while
+    }
+
     if (isset($cfgRelation['relation'])) {
         $cfgRelation['relwork']         = TRUE;
         if (isset($cfgRelation['table_info'])) {