diff --git a/ChangeLog b/ChangeLog index 5e62dc5b6..50b45dfbf 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,8 +5,11 @@ phpMyAdmin - Changelog $Id$ $Source$ +2002-07-11 Alexander M. Turek + * libraries/common.lib.php3: PHP3 compatibility. + 2002-07-11 Robin Johnson - * libraries/common.inc.php3: Fix for case where HTTP_HOST contains + * libraries/common.lib.php3: Fix for case where HTTP_HOST contains the port already, as adding HTTP_PORT is wrong then. 2002-07-10 Marc Delisle diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 32e9f7239..f6ebab1ac 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -522,7 +522,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} // work anyway, but display a big warning on the main.php3 // page. if (empty($cfg['PmaAbsoluteUri'])) { - $port_in_HTTP_HOST = strpos($HTTP_SERVER_VARS['HTTP_HOST'],':') !== FALSE; + $port_in_HTTP_HOST = strpos($HTTP_SERVER_VARS['HTTP_HOST'], ':') > 0; $cfg['PmaAbsoluteUri'] = (!empty($HTTP_SERVER_VARS['HTTPS']) ? 'https' : 'http') . '://' . $HTTP_SERVER_VARS['HTTP_HOST'] . ((!empty($HTTP_SERVER_VARS['SERVER_PORT']) && !$port_in_HTTP_HOST) ? ':' . $HTTP_SERVER_VARS['SERVER_PORT'] : '')