diff options
| author | Lilli <lilli@janrain.com> | 2010-04-28 13:48:35 -0700 |
|---|---|---|
| committer | Lilli <lilli@janrain.com> | 2010-04-28 13:48:35 -0700 |
| commit | 8dd00a8410ffca44300dfce698e57334b7056848 (patch) | |
| tree | 4e0c34c30511b55fd82635762072880a8c497e98 | |
| parent | d09063e987b77d134a89cd4f86557bbcbc9a2d4c (diff) | |
| parent | 624887b3a9d4d68c18c788adaa85f59cde2f9392 (diff) | |
| download | php-openid-8dd00a8410ffca44300dfce698e57334b7056848.zip php-openid-8dd00a8410ffca44300dfce698e57334b7056848.tar.gz php-openid-8dd00a8410ffca44300dfce698e57334b7056848.tar.bz2 | |
Merge branch 'master' of github.com:openid/php-openid
| -rw-r--r-- | Auth/OpenID/Parse.php | 26 | ||||
| -rw-r--r-- | Auth/OpenID/Server.php | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/Auth/OpenID/Parse.php b/Auth/OpenID/Parse.php index 4e6c7dd..455723d 100644 --- a/Auth/OpenID/Parse.php +++ b/Auth/OpenID/Parse.php @@ -218,17 +218,17 @@ class Auth_OpenID_Parse { function match($regexp, $text, &$match) { - if (!is_callable('mb_ereg_search_init')) { - return preg_match($regexp, $text, $match); - } else { - $regexp = substr($regexp, 1, strlen($regexp) - 2 - strlen($this->_re_flags)); - mb_ereg_search_init($text, $regexp); - if (!mb_ereg_search()) { - return false; - } - list($match) = mb_ereg_search_getregs(); - return true; - } + if (!is_callable('mb_ereg_search_init')) { + return preg_match($regexp, $text, $match); + } + + $regexp = substr($regexp, 1, strlen($regexp) - 2 - strlen($this->_re_flags)); + mb_ereg_search_init($text); + if (!mb_ereg_search($regexp)) { + return false; + } + list($match) = mb_ereg_search_getregs(); + return true; } /** @@ -269,8 +269,8 @@ class Auth_OpenID_Parse { // Try to find the <HEAD> tag. $head_re = $this->headFind(); - $html_match = ''; - if (!$this->match($html_re, $stripped, $html_match)) { + $head_match = ''; + if (!$this->match($head_re, $stripped, $head_match)) { ini_set( 'pcre.backtrack_limit', $old_btlimit ); return array(); } diff --git a/Auth/OpenID/Server.php b/Auth/OpenID/Server.php index 2994aea..cc8ba96 100644 --- a/Auth/OpenID/Server.php +++ b/Auth/OpenID/Server.php @@ -1464,7 +1464,7 @@ class Auth_OpenID_Encoder { array('location' => $location)); } else if ($encode_as == Auth_OpenID_ENCODE_HTML_FORM) { $wr = new $cls(AUTH_OPENID_HTTP_OK, array(), - $response->toFormMarkup()); + $response->toHTML()); } else { return new Auth_OpenID_EncodingError($response); } |