diff options
author | Marco Ceppi <marco@ceppi.net> | 2012-08-14 07:20:13 -0700 |
---|---|---|
committer | Marco Ceppi <marco@ceppi.net> | 2012-08-14 07:20:13 -0700 |
commit | dbd9d3edb9e23a4d8482f8af999f725bc74502c9 (patch) | |
tree | ceadbd004b9ef05dbf80c4ae8cf31e55baba04df /Auth | |
parent | dc4e0181a83656874db233916e17efbe8d8207d8 (diff) | |
parent | 5c78cf24bcdf5dfafbaa42210016809654125bc4 (diff) | |
download | php-openid-dbd9d3edb9e23a4d8482f8af999f725bc74502c9.zip php-openid-dbd9d3edb9e23a4d8482f8af999f725bc74502c9.tar.gz php-openid-dbd9d3edb9e23a4d8482f8af999f725bc74502c9.tar.bz2 |
Merge pull request #75 from cakebaker/bugfix-invalid-return-value
Fixing "preg_match_all() expects parameter 2 to be string, array given" error
Diffstat (limited to 'Auth')
-rw-r--r-- | Auth/OpenID/Parse.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Auth/OpenID/Parse.php b/Auth/OpenID/Parse.php index c81cb01..0461bdc 100644 --- a/Auth/OpenID/Parse.php +++ b/Auth/OpenID/Parse.php @@ -219,7 +219,11 @@ class Auth_OpenID_Parse { function match($regexp, $text, &$match) { if (!is_callable('mb_ereg_search_init')) { - return preg_match($regexp, $text, $match); + if (!preg_match($regexp, $text, $match)) { + return false; + } + $match = $match[0]; + return true; } $regexp = substr($regexp, 1, strlen($regexp) - 2 - strlen($this->_re_flags)); |