Merge branch 'case-sensitive-openid' into 'master'

Fix OpenID discovery in pages using uppercase <HEAD> tag Closes #60 See merge request !140

Merge branch 'case-sensitive-openid' into 'master'
Fix OpenID discovery in pages using uppercase <HEAD> tag Closes #60 See merge request !140
e3cafc01 · mattl · 3b363d62 · aac6a21c · e3cafc01
Commit e3cafc01 authored Jul 11, 2017 by mattl
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 13 deletions

extlib/Auth/OpenID/Parse.php extlib/Auth/OpenID/Parse.php +3 -13

No files found.
--- a/extlib/Auth/OpenID/Parse.php
+++ b/extlib/Auth/OpenID/Parse.php
@@ -218,21 +218,11 @@ class Auth_OpenID_Parse {
    function match($regexp, $text, &$match)
    {
-        if (!is_callable('mb_ereg_search_init')) {
+        if (preg_match($regexp, $text, $match)) {
-            if (!preg_match($regexp, $text, $match)) {
+           return true;
-                return false;
-            }
-            $match = $match[0];
-            return true;
        }
-        $regexp = substr($regexp, 1, strlen($regexp) - 2 - strlen($this->_re_flags));
+        return false;
-        mb_ereg_search_init($text);
-        if (!mb_ereg_search($regexp)) {
-            return false;
-        }
-        $match = mb_ereg_search_getregs();
-        return true;
    }
    /**