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

Merge remote-tracking branch 'origin/QA_3_5'

Browse Source
This commit is contained in:
Michal Čihař 2012-02-08 14:23:33 +01:00
commit b98fc5b0ca
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/config/ConfigFile.class.php
View File

@ -115,7 +115,7 @@ class ConfigFile
/**
* Returns PMA_Config without user preferences applied
*
*
* @return PMA_Config
*/
public function getOrgConfigObj()
@ -414,10 +414,10 @@ class ConfigFile
}
$verbose = $this->get("Servers/$id/verbose");
if (!empty($verbose)) {
return htmlspecialchars($verbose);
return $verbose;
}
$host = $this->get("Servers/$id/host");
return empty($host) ? 'localhost' : htmlspecialchars($host);
return empty($host) ? 'localhost' : $host;
}
/**

1
setup/lib/index.lib.php
View File

@ -303,6 +303,7 @@ function perform_config_checks()
if ($server_name == 'localhost') {
$server_name .= " [$i]";
}
$server_name = htmlspecialchars($server_name);
if ($cookie_auth_server && $blowfish_secret === null) {
$blowfish_secret = uniqid('', true);