Merge branch '1.0.x' into testing

diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 279265a30ee55a94e30daaf41ba06baea8822d3f..33248203bc4e62222f9dab33082ebb18d828e0e0 100644 (file)
--- a/actions/apitimelinefriends.php
+++ b/actions/apitimelinefriends.php
@@ -289,7 +289,13 @@ class ApiTimelineFriendsAction extends ApiBareAuthAction
     {
         $notices = array();
 
-        $stream = new InboxNoticeStream($this->user);
+        $profile = null;
+
+        if (isset($this->auth_user)) {
+            $profile = $this->auth_user->getProfile();
+        }
+
+        $stream = new InboxNoticeStream($this->user, $profile);
         
         $notice = $stream->getNotices(($this->page-1) * $this->count,
                                       $this->count,

diff --git a/lib/apiauth.php b/lib/apiauth.php
index 42d32dd624e0014c4e799bc18b3395cfe3725dc1..1061e6b68c0b6a9d6c034d3b2e4604e1a26c3c6f 100644 (file)
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -204,7 +204,12 @@ class ApiAuthAction extends ApiAction
                             }
                         }
                         $this->auth_user = $user;
-                        Event::handle('EndSetApiUser', array($user));
+                        // FIXME: setting the value returned by common_current_user()
+                        // There should probably be a better method for this. common_set_user()
+                        // does lots of session stuff.
+                        global $_cur;
+                        $_cur = $this->auth_user;
+                        Event::handle('EndSetApiUser', array($user)); 
                     }
 
                     $msg = "API OAuth authentication for user '%s' (id: %d) on behalf of " .

diff --git a/lib/framework.php b/lib/framework.php
index b0b50fc96187c56eea5b25b50acff466da13e3cc..9adaf7f838f938727066d6bd9660e81f432619f6 100644 (file)
--- a/lib/framework.php
+++ b/lib/framework.php
@@ -20,7 +20,7 @@
 if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 define('STATUSNET_BASE_VERSION', '1.0.0');
-define('STATUSNET_LIFECYCLE', 'alpha2'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
+define('STATUSNET_LIFECYCLE', 'alpha5'); // 'dev', 'alpha[0-9]+', 'beta[0-9]+', 'rc[0-9]+', 'release'
 define('STATUSNET_VERSION', STATUSNET_BASE_VERSION . STATUSNET_LIFECYCLE);
 
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility

diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 465b154cd4c3f6fbae7c1cb1bb558ff9b4ce35b8..016e657a8bef4496c990ab05817bad1d777f895d 100644 (file)
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -8912,7 +8912,7 @@ msgstr ""
 "\n"
 "%4$s\n"
 "\n"
-"Ne respondu al ĉi tiu retpoŝtadreso; respondo ne atingos lin.\n"
+"Ne respondu al ĉi tiu retpoŝtadreso; respondo ne atingos lin."
 
 #. TRANS: Subject for favorite notification e-mail.
 #. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.

diff --git a/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po b/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
index a9eda1b74d2031ae5292c48914b95fe79cd10dc9..5a050234f1dbff519316f8013d28f3c5b8711936 100644 (file)
--- a/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
+++ b/plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
@@ -127,7 +127,7 @@ msgstr ""
 "* Проверете дали сите зборови се напишани како што треба.\n"
 "* Обидете се со други клучни зборови.\n"
 "* Обидете се со поопшти клучни зборови.\n"
-"* Обидете се помалку клучни зборови.\n"
+"* Обидете се помалку клучни зборови."
 
 #. TRANS: Menu item text for user directory.
 msgctxt "MENU"

diff --git a/plugins/Directory/locale/tl/LC_MESSAGES/Directory.po b/plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
index 1002ef420e36a715487b32f8992027b3edbaa525..dc181fc065c64a285a0d723d5ab63f87f3b73d0d 100644 (file)
--- a/plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
+++ b/plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
@@ -128,7 +128,7 @@ msgstr ""
 "* Tiyakin na tama ang pagbabanghay ng lahat ng mga salita.\n"
 "* Sumubok ng ibang mga susing-salita.\n"
 "* Sumubok ng mas pangkalahatang mga susing-salita.\n"
-"* Sumubok ng mas kakaunting mga susing-salita.\n"
+"* Sumubok ng mas kakaunting mga susing-salita."
 
 #. TRANS: Menu item text for user directory.
 msgctxt "MENU"