diff options
| author | Remi Collet <fedora@famillecollet.com> | 2016-11-26 16:20:01 +0100 |
|---|---|---|
| committer | Remi Collet <fedora@famillecollet.com> | 2016-11-26 16:20:01 +0100 |
| commit | ad1604bc1768f3761fcdffea76f8b3e515e4a03e (patch) | |
| tree | 218a65dba8dc30f72fc510f038546f492b253f4c | |
| parent | 5fa2053c6d069042358fbfddd9ceb3e5f7ddd073 (diff) | |
phpMyAdmin: add patch from pr#12741
| -rw-r--r-- | phpMyAdmin-pr12741.patch | 24 | ||||
| -rw-r--r-- | phpMyAdmin.spec | 6 |
2 files changed, 30 insertions, 0 deletions
diff --git a/phpMyAdmin-pr12741.patch b/phpMyAdmin-pr12741.patch new file mode 100644 index 0000000..c095859 --- /dev/null +++ b/phpMyAdmin-pr12741.patch @@ -0,0 +1,24 @@ +From 546dda3fdce7ee8d71707a970baf3bfe19afb01f Mon Sep 17 00:00:00 2001 +From: Remi Collet <fedora@famillecollet.com> +Date: Sat, 26 Nov 2016 16:05:07 +0100 +Subject: [PATCH] make PMA_isAllowedDomain case insensitive, fix links on home + page + +Signed-off-by: Remi Collet <fedora@famillecollet.com> +--- + libraries/core.lib.php | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libraries/core.lib.php b/libraries/core.lib.php +index cb7161d..1b345d2 100644 +--- a/libraries/core.lib.php ++++ b/libraries/core.lib.php +@@ -765,7 +765,7 @@ function PMA_isAllowedDomain($url) + return false; + } + } +- $domain = $arr["host"]; ++ $domain = strtolower($arr["host"]); + $domainWhiteList = array( + /* Include current domain */ + $_SERVER['SERVER_NAME'], diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index fea80f3..2e3cb6c 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -37,6 +37,8 @@ Source1: https://files.phpmyadmin.net/%{name}/%{version}%{?prever:-%prever}/%{na Source2: phpMyAdmin.htaccess Source3: phpMyAdmin.nginx +Patch0: %{name}-pr12741.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: unzip @@ -96,6 +98,8 @@ is available in 50 languages %prep %setup -qn phpMyAdmin-%{version}%{?prever:-%prever}-all-languages +%patch0 -p1 + # Fix links on home page to match allowed domains # see https://github.com/phpmyadmin/phpmyadmin/pull/1291 sed -e 's/www.phpmyadmin.net/www.phpMyAdmin.net/' \ @@ -228,6 +232,8 @@ sed -e "/'blowfish_secret'/s/MUSTBECHANGEDONINSTALL/$SECRET/" \ %changelog * Sat Nov 26 2016 Remi Collet <remi@remirepo.net> 4.6.5.1-1 - update to 4.6.5.1 (2016-11-26, bug fixes) +- add patch to fix broken links on home page, + open https://github.com/phpmyadmin/phpmyadmin/pull/12741 * Fri Nov 25 2016 Remi Collet <remi@remirepo.net> 4.6.5-1 - update to 4.6.5 (2016-11-25, security and bug fixes) |