From: Brion Vibber <brion@pobox.com>
Date: Mon, 7 Jun 2010 17:19:40 +0000 (-0700)
Subject: Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d88b208edcb75ec864e09bb3ab29785b35064400;p=quix0rs-gnu-social.git

Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
	plugins/OpenID/openid.php
---

d88b208edcb75ec864e09bb3ab29785b35064400
diff --cc lib/language.php
index 5a2818133d,cb12cca692..1805707ad5
--- a/lib/language.php
+++ b/lib/language.php
@@@ -218,10 -221,9 +222,10 @@@ function _mdomain($backtrace
              } else {
                  // We might be running directly from the plugins dir?
                  // If so, there's no place to store locale info.
-                 return null;
+                 return 'statusnet';
              }
          }
 +        $cached[$path] = $final;
      }
      return $cached[$path];
  }
diff --cc plugins/OpenID/openid.php
index 68851f4eb9,8be02e031c..4ce350f773
--- a/plugins/OpenID/openid.php
+++ b/plugins/OpenID/openid.php
@@@ -145,11 -144,10 +145,13 @@@ function oid_authenticate($openid_url, 
  
      // Handle failure status return values.
      if (!$auth_request) {
+         common_log(LOG_ERR, __METHOD__ . ": mystery fail contacting $openid_url");
 +        // TRANS: OpenID plugin message. Given when an OpenID is not valid.
          return _m('Not a valid OpenID.');
      } else if (Auth_OpenID::isFailure($auth_request)) {
+         common_log(LOG_ERR, __METHOD__ . ": OpenID fail to $openid_url: $auth_request->message");
 +        // TRANS: OpenID plugin server error. Given when the OpenID authentication request fails.
 +        // TRANS: %s is the failure message.
          return sprintf(_m('OpenID failure: %s'), $auth_request->message);
      }