Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

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

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 = '';
     }
 }
 

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';