Permalink
Browse files

Merge branch 'master' of github.com:openid/php-openid

  • Loading branch information...
2 parents d09063e + 624887b commit 8dd00a8410ffca44300dfce698e57334b7056848 Lilli committed Apr 28, 2010
Showing with 14 additions and 14 deletions.
  1. +13 −13 Auth/OpenID/Parse.php
  2. +1 −1 Auth/OpenID/Server.php
View
@@ -218,17 +218,17 @@ function removeQuotes($str)
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 @@ function parseLinkAttrs($html)
// 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();
}
View
@@ -1464,7 +1464,7 @@ function encode($response)
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);
}

0 comments on commit 8dd00a8

Please sign in to comment.