gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michal Čihař 2012-04-14 13:38:48 +02:00
commit 198a270ddc
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.php
View File

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

2
libraries/common.inc.php
View File

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