git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit a75b1df6 authored by mmn's avatar mmn

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

parents d564e28f e3cafc01
avatar/*
files/*
file/*
local/*
_darcs/*
logs/*
log/*
run/*
avatar/
files/
file/
local/
_darcs/
logs/
log/
run/
config.php
.htaccess
httpd.conf
......
......@@ -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)) {
return false;
}
$match = $match[0];
return true;
if (preg_match($regexp, $text, $match)) {
return true;
}
$regexp = substr($regexp, 1, strlen($regexp) - 2 - strlen($this->_re_flags));
mb_ereg_search_init($text);
if (!mb_ereg_search($regexp)) {
return false;
}
$match = mb_ereg_search_getregs();
return true;
return false;
}
/**
......
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