diff --git a/ChangeLog b/ChangeLog index 59a7a4144d..9d6c3037e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -120,7 +120,7 @@ phpMyAdmin - ChangeLog - bug #3497151 [interface] Duplicate inline query edit box - bug #3504567 [mime] Description of the transformation missing in the tooltip -3.4.11.0 (not yet released) +3.4.11.0 (2012-04-14) - bug #3486970 [import] Exception on XML import - bug #3488777 [navi] $cfg['ShowTooltipAliasTB'] and blank names in navigation - bug #3512565 [navi] Fixed missing word "Rows" in table list tooltip after click diff --git a/index.php b/index.php index 16f1a73e8c..1bf8688c1d 100644 --- a/index.php +++ b/index.php @@ -17,10 +17,9 @@ session_write_close(); // Gets the host name if (empty($HTTP_HOST)) { + $HTTP_HOST = ''; if (PMA_getenv('HTTP_HOST')) { $HTTP_HOST = PMA_getenv('HTTP_HOST'); - } else { - $HTTP_HOST = ''; } } diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 57a3de54e6..aaf7887ed4 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -131,7 +131,7 @@ if (!defined('PMA_MINIMUM_COMMON')) { include_once './libraries/common.lib.php'; /** - * Java script escaping. + * JavaScript escaping. */ include_once './libraries/js_escape.lib.php';