From 8fecf6d1ac210008420c3697773f715cd5827dd1 Mon Sep 17 00:00:00 2001 From: mattab Date: Fri, 12 Dec 2014 14:20:35 +1300 Subject: [PATCH] Add strtolower for comparison, regression --- core/Tracker/PageUrl.php | 2 +- plugins/CustomAlerts | 2 +- tests/PHPUnit/UI | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/Tracker/PageUrl.php b/core/Tracker/PageUrl.php index e629ef55bfc..4174a3168fd 100644 --- a/core/Tracker/PageUrl.php +++ b/core/Tracker/PageUrl.php @@ -259,7 +259,7 @@ public static function reencodeParameters(&$queryParameters, $encoding = false) if (function_exists('mb_check_encoding')) { // if query params are encoded w/ non-utf8 characters (due to browser bug or whatever), // encode to UTF-8. - if ($encoding != 'utf-8' + if (strtolower($encoding) != 'utf-8' && $encoding != false ) { Common::printDebug("Encoding page URL query parameters to $encoding."); diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts index 8ad0ac8638c..2f10c8b4962 160000 --- a/plugins/CustomAlerts +++ b/plugins/CustomAlerts @@ -1 +1 @@ -Subproject commit 8ad0ac8638c27a93cb4bef80ecdd29b56876430b +Subproject commit 2f10c8b496252d1527a47864cf39d18b359b7ae3 diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI index 4d8fb3daa22..bc4eed362e3 160000 --- a/tests/PHPUnit/UI +++ b/tests/PHPUnit/UI @@ -1 +1 @@ -Subproject commit 4d8fb3daa22a7fee386bf0990912f3b5e4ecfa36 +Subproject commit bc4eed362e35a721cd0911393a9cc1df6580a1d0