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

Conflicts:
	lib/language.php
	plugins/OpenID/finishaddopenid.php

diff --cc actions/apitimelinefriends.php
Simple merge

diff --cc actions/apitimelinehome.php
Simple merge

diff --cc actions/apitimelinepublic.php
Simple merge

diff --cc classes/File.php
Simple merge

diff --cc classes/Notice.php
Simple merge

diff --cc lib/atomgroupnoticefeed.php
index b4810d04a082630cea2ce2b6b94d68b7944b5693,7934a4f9e5483ffcff4f17b249184f0860d13d92..c7c36af82571faf995447e5e5c3bc2ac8fa57a2a
--- 1/lib/atomgroupnoticefeed.php
--- 2/lib/atomgroupnoticefeed.php
+++ b/lib/atomgroupnoticefeed.php
@@@ -54,11 -55,10 +55,11 @@@ class AtomGroupNoticeFeed extends AtomN
       *
       * @return void
       */
-     function __construct($group, $indent = true) {
-         parent::__construct($indent);
+     function __construct($group, $cur = null, $indent = true) {
+         parent::__construct($cur, $indent);
          $this->group = $group;
  
 +        // TRANS: Title in atom group notice feed. %s is a group name.
          $title      = sprintf(_("%s timeline"), $group->nickname);
          $this->setTitle($title);
  

diff --cc lib/atomusernoticefeed.php
Simple merge

diff --cc lib/language.php
index 8009adc9b741c278506271e67e900b48c6e91ddc,3846b8f358bdb9581d3e54286c93a1fd14ddbe3f..5a2818133d6979e7fa8e903323851b2549cb3d2a
--- 1/lib/language.php
--- 2/lib/language.php
+++ b/lib/language.php
@@@ -206,15 -205,21 +206,22 @@@ function _mdomain($backtrace
          if (DIRECTORY_SEPARATOR !== '/') {
              $path = strtr($path, DIRECTORY_SEPARATOR, '/');
          }
-         $cut = strpos($path, '/plugins/');
-         if ($cut) {
-             $cut += strlen('/plugins/');
+         $plug = strpos($path, '/plugins/');
+         if ($plug === false) {
+             // We're not in a plugin; return null for the default domain.
+             return null;
+         } else {
+             $cut = $plug + 9;
              $cut2 = strpos($path, '/', $cut);
-             if ($cut && $cut2) {
-                 $final = substr($path, $cut, $cut2 - $cut);
+             if ($cut2) {
+                 $cached[$path] = substr($path, $cut, $cut2 - $cut);
+             } else {
+                 // We might be running directly from the plugins dir?
+                 // If so, there's no place to store locale info.
+                 return null;
              }
          }
 +        $cached[$path] = $final;
      }
      return $cached[$path];
  }

diff --cc plugins/OpenID/finishaddopenid.php
index e07ab764e1bd78a68b5047d4f710bab3018035d1,064e976426c58b58d9a6452cd5cb81db2e59bb01..47b3f7fb167c9de4890d8708013eb85e840edba4
--- 1/plugins/OpenID/finishaddopenid.php
--- 2/plugins/OpenID/finishaddopenid.php
+++ b/plugins/OpenID/finishaddopenid.php
@@@ -138,13 -132,15 +138,16 @@@ class FinishaddopenidAction extends Act
                  $this->message(_m('Error connecting user.'));
                  return;
              }
-             if ($sreg) {
-                 if (!oid_update_user($cur, $sreg)) {
-                     // TRANS: message in case the user or the user profile cannot be saved in StatusNet.
-                     $this->message(_m('Error updating profile'));
-                     return;
+             if (Event::handle('StartOpenIDUpdateUser', array($cur, $canonical, &$sreg))) {
+                 if ($sreg) {
+                     if (!oid_update_user($cur, $sreg)) {
++                        // TRANS: message in case the user or the user profile cannot be saved in StatusNet.
+                         $this->message(_m('Error updating profile'));
+                         return;
+                     }
                  }
              }
+             Event::handle('EndOpenIDUpdateUser', array($cur, $canonical, $sreg));
  
              // success!
  

diff --cc plugins/OpenID/finishopenidlogin.php
Simple merge

diff --cc plugins/OpenID/openid.php
Simple merge