Merge branch 'QA_4_2'

This commit is contained in:
Marc Delisle 2014-07-18 11:48:02 -04:00
commit 97273edddf
2 changed files with 3 additions and 2 deletions

View File

@ -23,6 +23,7 @@ phpMyAdmin - ChangeLog
+ rfe #637 Custom Field Handlers
4.2.7.0 (not yet released)
- bug Broken links on home page
4.2.6.0 (2014-07-17)
- bug #4471 Undefined index warning with referenced column.

View File

@ -835,7 +835,7 @@ function PMA_isAllowedDomain($url)
/* Include current domain */
$_SERVER['SERVER_NAME'],
/* phpMyAdmin domains */
'wiki.phpmyadmin.net', 'www.phpMyAdmin.net', 'phpmyadmin.net',
'wiki.phpmyadmin.net', 'www.phpmyadmin.net', 'phpmyadmin.net',
'docs.phpmyadmin.net',
/* mysql.com domains */
'dev.mysql.com','bugs.mysql.com',
@ -846,7 +846,7 @@ function PMA_isAllowedDomain($url)
/* Following are doubtful ones. */
'www.primebase.com','pbxt.blogspot.com'
);
if (in_array($domain, $domainWhiteList)) {
if (in_array(strtolower($domain), $domainWhiteList)) {
return true;
}