From 08d0c5f7b055137ad9d7ecdf2a9dd20416677779 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Sat, 18 Mar 2017 19:32:58 +0100 Subject: [PATCH 1/2] Fix case-sensitivity in discovery Fixes #133 --- Auth/OpenID/Parse.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Auth/OpenID/Parse.php b/Auth/OpenID/Parse.php index 9c0a255e..d6ed5baa 100644 --- a/Auth/OpenID/Parse.php +++ b/Auth/OpenID/Parse.php @@ -218,12 +218,12 @@ function removeQuotes($str) function match($regexp, $text, &$match) { - if (!is_callable('mb_ereg_search_init')) { - if (!preg_match($regexp, $text, $match)) { - return false; - } - $match = $match[0]; - return true; + if (preg_match($regexp, $text, $match)) { + return true; + } + + if ( !is_callable('mb_ereg_search_init')) { + return false; } $regexp = substr($regexp, 1, strlen($regexp) - 2 - strlen($this->_re_flags)); From a3d0943aa8e8f0ef3631bbaa0a4fe8f57ae8e8de Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 20 Mar 2017 09:31:37 +0100 Subject: [PATCH 2/2] Further simplify match code --- Auth/OpenID/Parse.php | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/Auth/OpenID/Parse.php b/Auth/OpenID/Parse.php index d6ed5baa..6c8a8c2c 100644 --- a/Auth/OpenID/Parse.php +++ b/Auth/OpenID/Parse.php @@ -221,18 +221,7 @@ function match($regexp, $text, &$match) if (preg_match($regexp, $text, $match)) { return true; } - - if ( !is_callable('mb_ereg_search_init')) { - return false; - } - - $regexp = substr($regexp, 1, strlen($regexp) - 2 - strlen($this->_re_flags)); - mb_ereg_search_init($text); - if (!mb_ereg_search($regexp)) { - return false; - } - $match = mb_ereg_search_getregs(); - return true; + return false; } /**