From: Evan Prodromou <evan@status.net>
Date: Mon, 30 May 2011 19:37:46 +0000 (-0400)
Subject: Merge branch '1.0.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=412adfb587e6796cf9db060ed5f749063a5c9fd0;hp=d544c78276e6b822e94e7714a98f73b941189185;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into testing
---

diff --git a/actions/apitimelinefriends.php b/actions/apitimelinefriends.php
index 279265a30e..33248203bc 100644
--- 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 42d32dd624..1061e6b68c 100644
--- 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 b0b50fc961..9adaf7f838 100644
--- 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 465b154cd4..016e657a8b 100644
--- 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 a9eda1b74d..5a050234f1 100644
--- 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 1002ef420e..dc181fc065 100644
--- 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"