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

.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

extlib/Auth/OpenID/Parse.php

@@ -218,22 +218,12 @@ 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];
+        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;
-    }
 
     /**
      * Find all link tags in a string representing a HTML document and