backpatches for 3.3.1 release

diff --git a/HISTORY b/HISTORY
index 5ab218c08f4797a467ea55aa294de2bd17eab254..8fb18862e2ce2e99a15dff1468420cd9b9116f2c 100644 (file)
--- a/HISTORY
+++ b/HISTORY
@@ -1,8 +1,8 @@
 phpPgAdmin History
 ------------------
 
-Version 3.4-dev
------------
+Version 3.3.1
+-------------
 
 Bugs
 * Fix table stats for <= 7.2

diff --git a/classes/database/BaseDB.php b/classes/database/BaseDB.php
index 513c9a9663690c88c5b4978d49a643e8a709f334..e5bf906c64e643ef95afe5568b145d3421c865a7 100644 (file)
--- a/classes/database/BaseDB.php
+++ b/classes/database/BaseDB.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: BaseDB.php,v 1.41 2004/03/06 11:30:00 chriskl Exp $
+ * $Id: BaseDB.php,v 1.40.2.1 2004/03/07 06:39:05 chriskl Exp $
  */
 
 include_once('./classes/database/ADODB_base.php');

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 5955013dbad9f4bf5ca74896d4c3cc7e3891df57..4c72752c188fc1772670980d8bf2e2ed948592da 100755 (executable)
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: Postgres.php,v 1.184 2004/03/06 11:30:00 chriskl Exp $
+ * $Id: Postgres.php,v 1.182.2.1 2004/03/07 06:39:05 chriskl Exp $
  */
 
 // @@@ THOUGHT: What about inherits? ie. use of ONLY???

diff --git a/classes/database/Postgres72.php b/classes/database/Postgres72.php
index 484c05cbbc1f3015e175a120f5494894597d0822..9e66aa89313f3d11ac995bf6d901dbe7a4c0d6aa 100644 (file)
--- a/classes/database/Postgres72.php
+++ b/classes/database/Postgres72.php
@@ -4,7 +4,7 @@
  * A class that implements the DB interface for Postgres
  * Note: This class uses ADODB and returns RecordSets.
  *
- * $Id: Postgres72.php,v 1.58 2004/03/06 11:30:00 chriskl Exp $
+ * $Id: Postgres72.php,v 1.57.2.1 2004/03/07 06:39:05 chriskl Exp $
  */
 
 

diff --git a/info.php b/info.php
index 993684f89e2355cba05a8d0a77e9c687c2bd97ac..ac2ee31aaf59805b5d80df8ba4d3b73abf84d815 100644 (file)
--- a/info.php
+++ b/info.php
@@ -3,7 +3,7 @@
        /**
         * List extra information on a table
         *
-        * $Id: info.php,v 1.6 2004/03/06 11:30:00 chriskl Exp $
+        * $Id: info.php,v 1.5.2.1 2004/03/07 06:39:05 chriskl Exp $
         */
 
        // Include application functions

diff --git a/lang/recoded/spanish.php b/lang/recoded/spanish.php
index 8240cb0c671abc0ff4f0f4baf5342a9638e7654a..50485d9de17ed0a711a19253d9336a2fead545a9 100644 (file)
--- a/lang/recoded/spanish.php
+++ b/lang/recoded/spanish.php
@@ -4,7 +4,7 @@
         * Spanish language file for phpPgAdmin.
         * @maintainer Martín Marqués ([email protected])
         *
-        * $Id: spanish.php,v 1.22 2004/03/07 03:19:55 chriskl Exp $
+        * $Id: spanish.php,v 1.21.2.1 2004/03/07 06:39:05 chriskl Exp $
         */
 
        // Language and character set

diff --git a/lang/spanish.php b/lang/spanish.php
index 697c65b48c48bcc4dfebc6e09e2abd51b25ad871..2449e0d4e0604c9a0f8f6897ddf223fbc2593eed 100644 (file)
--- a/lang/spanish.php
+++ b/lang/spanish.php
@@ -4,7 +4,7 @@
         * Spanish language file for phpPgAdmin.
         * @maintainer Martín Marqués ([email protected])
         *
-        * $Id: spanish.php,v 1.22 2004/03/07 03:19:55 chriskl Exp $
+        * $Id: spanish.php,v 1.21.2.1 2004/03/07 06:39:05 chriskl Exp $
         */
 
        // Language and character set

diff --git a/libraries/lib.inc.php b/libraries/lib.inc.php
index fbb4ead64f14c02b5496f76eedb4c9c860dddb2b..2a6184ee1b2d7ffda83026c5a996231ace329d02 100644 (file)
--- a/libraries/lib.inc.php
+++ b/libraries/lib.inc.php
@@ -3,7 +3,7 @@
        /**
         * Function library read in upon startup
         *
-        * $Id: lib.inc.php,v 1.74 2004/03/04 01:27:29 chriskl Exp $
+        * $Id: lib.inc.php,v 1.73.2.1 2004/03/07 06:39:05 chriskl Exp $
         */
        
        // Set error reporting level to max
@@ -13,7 +13,7 @@
        $appName = 'phpPgAdmin';
 
        // Application version
-       $appVersion = '3.4-dev';
+       $appVersion = '3.3.1';
 
 
        // Check to see if the configuration file exists, if not, explain