From aac6a21c4e53ed5952d195a6d39e6dbd0537637f Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Sat, 8 Apr 2017 09:13:59 +0200 Subject: [PATCH 1/2] Fix OpenID discovery in pages using uppercase tag Closes #60 Equivalent change was proposed upstream: https://github.com/openid/php-openid/pull/134 --- extlib/Auth/OpenID/Parse.php | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/extlib/Auth/OpenID/Parse.php b/extlib/Auth/OpenID/Parse.php index 0461bdcff7..af0b86af7e 100644 --- a/extlib/Auth/OpenID/Parse.php +++ b/extlib/Auth/OpenID/Parse.php @@ -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; } /** From 2ebdac70da93e342e449841114b092acb2fca019 Mon Sep 17 00:00:00 2001 From: Takuma YOSHIOKA Date: Sat, 29 Apr 2017 14:22:36 +0900 Subject: [PATCH 2/2] Ignore whole directory, not only inner contents `dir/*` style let git ignore files and directories in `dir/`, but not `dir/` itself. This cause `git clean -df` to remove `dir/` **with its contents**! To prevent `git clean -df` to remove data directories (`avatar/`, `file/`, etc), use `dir/` (or `dir`) style in gitignore. --- .gitignore | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 102173e832..57ea182b2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,11 @@ -avatar/* -files/* -file/* -local/* -_darcs/* -logs/* -log/* -run/* +avatar/ +files/ +file/ +local/ +_darcs/ +logs/ +log/ +run/ config.php .htaccess httpd.conf