We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit a75b1df6 authored by mattl's avatar mattl

Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes

parents d564e28f e3cafc01
avatar/* avatar/
files/* files/
file/* file/
local/* local/
_darcs/* _darcs/
logs/* logs/
log/* log/
run/* run/
config.php config.php
.htaccess .htaccess
httpd.conf httpd.conf
......
...@@ -218,21 +218,11 @@ class Auth_OpenID_Parse { ...@@ -218,21 +218,11 @@ class Auth_OpenID_Parse {
function match($regexp, $text, &$match) 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;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment