From 01264ae3b5546e29ecfcc72648d140767177a7d0 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Sat, 21 Sep 2002 06:43:10 +0000
Subject: [PATCH] Backwards compatibility

---
 ChangeLog                        |  2 ++
 libraries/common.lib.php3        |  2 +-
 libraries/config_import.lib.php3 | 20 +++++++-------------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 963415bfd..da757cf32 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ $Source$
 
 2002-09-21 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/german-*.inc.php3: Updates.
+    * libraries/common.lib.php3, libraries/config_import.lib.php3: Backwards
+      compatibility for config.inc.php3 < rev 1.144.
 
 2002-09-20 Marc Delisle  <lem9@users.sourceforge.net>
     * libraries/display_tbl.lib.php3: bug 612117, vertical view and
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index acc07cc3d..1f1c69c82 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -128,7 +128,7 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
      * Includes compatibility code for older config.inc.php3 revisions
      * if necessary
      */
-    if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 141) {
+    if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 144) {
         include('./libraries/config_import.lib.php3');
     }
 
diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3
index 373d26fe2..c41ac6616 100644
--- a/libraries/config_import.lib.php3
+++ b/libraries/config_import.lib.php3
@@ -338,6 +338,10 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){
         }
     }
 
+    if (!isset($cfg['CharEditing'])) {
+        $cfg['CharEditing'] = 'input';
+    }
+
     if (!isset($cfg['ZipDump'])) {
         if (isset($cfgZipDump)) {
             $cfg['ZipDump'] = $cfgZipDump;
@@ -543,23 +547,13 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')){
     if (!isset($cfg['TextareaAutoSelect'])) {
         $cfg['TextareaAutoSelect']  = TRUE;
     }
-    
+
     if (!isset($cfg['CharTextareaCols'])) {
-        if (isset($cfgCharTextareaCols)) {
-            $cfg['CharTextareaCols'] = $cfgCharTextareaCols;
-            unset($cfgCharTextareaCols);
-        } else {
-            $cfg['CharTextareaCols'] = 40;
-        }
+        $cfg['CharTextareaCols'] = 40;
     }
 
     if (!isset($cfg['CharTextareaRows'])) {
-        if (isset($cfgCharTextareaRows)) {
-            $cfg['CharTextareaRows'] = $cfgCharTextareaRows;
-            unset($cfgCharTextareaRows);
-        } else {
-            $cfg['CharTextareaRows'] = 2;
-        }
+        $cfg['CharTextareaRows'] = 2;
     }
 
     if (!isset($cfg['LimitChars'])) {