From 8623d1e6186531a71e0ec40e0e76367c1ba73e9a Mon Sep 17 00:00:00 2001
From: chriskl <chriskl>
Date: Mon, 9 Jan 2006 05:43:48 +0000
Subject: [PATCH] Fix PostgreSQL 7.2 and lower (tree assumed schemas)

---
 classes/Misc.php | 17 +++--------------
 database.php     |  5 ++++-
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/classes/Misc.php b/classes/Misc.php
index f7c1b92f..08aa32d2 100644
--- 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 da555cda..391f6056 100755
--- 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);
 		
-- 
2.39.5