From ea5b1b76340d506c8099f4dce2063c7e400898b7 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Mon, 24 Feb 2003 22:45:12 +0000
Subject: [PATCH] backwards compatibility

---
 ChangeLog                 | 11 +++++++----
 libraries/common.lib.php3 | 12 ++++++------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 690756ed7..81b6a66c1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-02-24 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * common.lib.php3: Backwards compatibility.
+
 2003-02-24 Garvin Hicking <me@supergarv.de>
     Submitted multiple patches from the patch tracker:
 
@@ -58,10 +61,10 @@ $Source$
         tbl_query_box.php3, common.lib.php3
 
 2003-02-24 Olivier L. Müller  <om@omnis.ch>
-    * libraries/common.lib.php3: if $cfg['PmaAbsoluteUri'] is empty and 
-      port == 80 or port == 443, do not add ":80" or ":443" anymore to the 
-      generated URL -> prevents a double password query with some browsers 
-      (Safari) in case of http authentication.  (tested with https, http and 
+    * libraries/common.lib.php3: if $cfg['PmaAbsoluteUri'] is empty and
+      port == 80 or port == 443, do not add ":80" or ":443" anymore to the
+      generated URL -> prevents a double password query with some browsers
+      (Safari) in case of http authentication.  (tested with https, http and
       http running on port 8080)
 
 2003-02-24 Michal Cihar  <nijel@users.sourceforge.net>
diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3
index 6f4a75d3b..d4262a38f 100644
--- a/libraries/common.lib.php3
+++ b/libraries/common.lib.php3
@@ -130,7 +130,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) < 156) {
+    if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 161) {
         include('./libraries/config_import.lib.php3');
     }
 
@@ -525,8 +525,8 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         $cfg['PmaAbsoluteUri']          = ((!empty($HTTP_SERVER_VARS['HTTPS']) && strtolower($HTTP_SERVER_VARS['HTTPS']) != 'off') ? 'https' : 'http') . '://'
                                         . $HTTP_SERVER_VARS['HTTP_HOST'];
 
-        // if $cfg['PmaAbsoluteUri'] is empty and port == 80 or port == 443, do not add ":80" or ":443" 
-        // to the generated URL -> prevents a double password query in case of http authentication. 
+        // if $cfg['PmaAbsoluteUri'] is empty and port == 80 or port == 443, do not add ":80" or ":443"
+        // to the generated URL -> prevents a double password query in case of http authentication.
 
         if (!(!$port_in_HTTP_HOST && !empty($HTTP_SERVER_VARS['SERVER_PORT']) && ($HTTP_SERVER_VARS['SERVER_PORT'] == 80 || $HTTP_SERVER_VARS['SERVER_PORT'] == 443))) {
             $cfg['PmaAbsoluteUri']      .= ((!empty($HTTP_SERVER_VARS['SERVER_PORT']) && !$port_in_HTTP_HOST) ? ':' . $HTTP_SERVER_VARS['SERVER_PORT'] : '');
@@ -1269,7 +1269,7 @@ if (typeof(document.getElementById) != 'undefined'
                 if ($cfg['QueryFrameJS'] && $cfg['QueryFrame']) {
                     $onclick = 'onclick="focus_querywindow(); return false;"';
                 }
-                
+
                 $edit_link = '&nbsp;[<a href="'
                            . $edit_target
                            . $url_qpart
@@ -1678,7 +1678,7 @@ if (typeof(document.getElementById) != 'undefined'
     function PMA_flipstring($string, $seperator = "<br />\n") {
         $format_string = '';
         $charbuff = false;
-        
+
         for ($i = 0; $i <= strlen($string); $i++) {
             $char = substr($string, $i, 1);
             $append = false;
@@ -1737,7 +1737,7 @@ if (typeof(document.getElementById) != 'undefined'
                 $tmp_file = dirname($tmp_file);
             }
             $tmp_file     .= '/' . basename($filename);
-    
+
             // User might have trailing slash in php.ini...
             return (ereg_replace('/+', '/', $tmp_file) == $filename);
         } // end of the 'is_uploaded_file()' emulated function