Fix PostgreSQL 7.2 and lower (tree assumed schemas)

diff --git a/classes/Misc.php b/classes/Misc.php
index f7c1b92fe4a98f40d1a60cef76558e1b38a3756c..08aa32d2e09bc585bbf10d8bb8a3065b14665d87 100644 (file)
--- a/classes/Misc.php
+++ b/classes/Misc.php
@@ -2,7 +2,7 @@
        /**
         * Class to hold various commonly used functions
         *
-        * $Id: Misc.php,v 1.124 2006/01/06 21:06:57 xzilla Exp $
+        * $Id: Misc.php,v 1.125 2006/01/09 05:43:49 chriskl Exp $
         */
         
        class Misc {
@@ -424,19 +424,8 @@
                        global $misc, $conf, $data, $lang;
                        
                        if (is_string($tabs)) {
-                               switch ($tabs) {
-                                       case 'database':
-                                       case 'schema':
-                                               if ($data->hasSchemas() === false) {
-                                                       $this->printTabs($this->getNavTabs('database'), $activetab);
-                                                       $this->printTabs($this->getNavTabs('schema'), $activetab);
-                                                       $_SESSION['webdbLastTab']['database'] = $activetab;
-                                                       return;
-                                               }
-                                       default:
-                                               $_SESSION['webdbLastTab'][$tabs] = $activetab;
-                                               $tabs = $this->getNavTabs($tabs);
-                               }
+                               $_SESSION['webdbLastTab'][$tabs] = $activetab;
+                               $tabs = $this->getNavTabs($tabs);
                        }
                        
                        echo "<table class=\"tabs\"><tr>\n";

diff --git a/database.php b/database.php
index da555cdabe21b8ad433b0df3c4f53c742f4b2b2d..391f6056deea2d79e86b44200a04f2ee6e127342 100755 (executable)
--- a/database.php
+++ b/database.php
@@ -3,7 +3,7 @@
        /**
         * Manage schemas within a database
         *
-        * $Id: database.php,v 1.79 2005/11/25 08:59:35 jollytoad Exp $
+        * $Id: database.php,v 1.80 2006/01/09 05:43:48 chriskl Exp $
         */
 
        // Include application functions
@@ -541,6 +541,9 @@
                $reqvars = $misc->getRequestVars('database');
 
                $tabs = $misc->getNavTabs('database');
+               if (!$data->hasSchemas()) {
+                       $tabs = array_merge($misc->getNavTabs('schema'), $tabs);
+               }
 
                $items = $misc->adjustTabsForTree($tabs);