From: Brion Vibber <brion@pobox.com>
Date: Thu, 20 Jan 2011 23:12:57 +0000 (-0800)
Subject: Merge branch '0.9.x' into testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6fa0bea76db45454071a08b12664d9f25fea5ca5;p=quix0rs-gnu-social.git

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

6fa0bea76db45454071a08b12664d9f25fea5ca5
diff --cc actions/apitimelineuser.php
index 24aa08e279,85e8f97b2a..c1e66021b6
--- a/actions/apitimelineuser.php
+++ b/actions/apitimelineuser.php
@@@ -431,10 -434,10 +434,10 @@@ class ApiTimelineUserAction extends Api
                  } else {
                      $group = User_group::staticGet('uri', $uri);
                      if (!empty($group)) {
 -                        $options['groups'] = $uri;
 +                        $options['groups'][] = $uri;
                      } else {
                          // @fixme: hook for discovery here
-                         common_log(LOG_WARNING, sprintf(_('AtomPub post with unknown attention URI %s'), $uri));
+                         common_log(LOG_WARNING, sprintf('AtomPub post with unknown attention URI %s', $uri));
                      }
                  }
              }