GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
Mikael Nordfeldth 2017-07-11 21:44:50 +02:00
parent d564e28f8e e3cafc011e
commit a75b1df627
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.gitignore vendored
View File

@ -1,11 +1,11 @@
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

16
extlib/Auth/OpenID/Parse.php
View File

@ -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;
} }
/** /**