From 7127ed28c96eb423e49b3c15ade0b0e03f7911a6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 18 Jul 2014 08:38:33 +0200 Subject: [PATCH 1/2] Fix link in home page. Web site: url.php?url=http://www.phpMyAdmin.net/ => OK Improve: url.php?url=http://www.phpmyadmin.neti/home_page/improve.php => broken Support: url.php?url=http://www.phpmyadmin.net/home_page/support.php => broken As domain name are not case sensitive, this seems the simpler fix. (other solution, fix index.php to use CamelCase names for all links) Signed-off-by: Marc Delisle --- libraries/core.lib.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index a415f3f615..37558a4b79 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -838,7 +838,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', @@ -849,7 +849,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; } From e9870f79fcd0822bd4bdf532e5e4363c083b15ab Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 18 Jul 2014 11:47:12 -0400 Subject: [PATCH 2/2] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index bb7e9cda0d..fa52a49901 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 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.