Merge branch '0.9.x' into inblob

diff --combined plugins/PubSubHubBub/PubSubHubBubPlugin.php
index d9c047de85ed1761b78571208d08f6a89fb9d298,c40d906a538655f463bc2d66bc05332a954c893e..367b354034e42980a472361dcc3eb775bdd515a5
--- 1/plugins/PubSubHubBub/PubSubHubBubPlugin.php
--- 2/plugins/PubSubHubBub/PubSubHubBubPlugin.php
+++ b/plugins/PubSubHubBub/PubSubHubBubPlugin.php
@@@ -95,16 -95,14 +95,16 @@@ class PubSubHubBubPlugin extends Plugi
          }
  
          //feed of each user that subscribes to the notice's author
 -        $notice_inbox = new Notice_inbox();
 -        $notice_inbox->notice_id = $notice->id;
 -        if ($notice_inbox->find()) {
 -            while ($notice_inbox->fetch()) {
 -                $user = User::staticGet('id',$notice_inbox->user_id);
 -                $feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'rss'));
 -                $feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'atom'));
 +
 +        $ni = $notice->whoGets();
 +
 +        foreach (array_keys($ni) as $user_id) {
 +            $user = User::staticGet('id', $user_id);
 +            if (empty($user)) {
 +                continue;
              }
 +            $feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'rss'));
 +            $feeds[]=common_local_url('ApiTimelineUser',array('id' => $user->nickname, 'format'=>'atom'));
          }
  
          //feed of user replied to
@@@ -120,4 -118,16 +120,16 @@@
              }
          }
      }
+ 
+     function onPluginVersion(&$versions)
+     {
+         $versions[] = array('name' => 'PubSubHubBub',
+                             'version' => STATUSNET_VERSION,
+                             'author' => 'Craig Andrews',
+                             'homepage' => 'http://status.net/wiki/Plugin:PubSubHubBub',
+                             'rawdescription' =>
+                             _m('The PubSubHubBub plugin pushes RSS/Atom updates to a <a href="http://pubsubhubbub.googlecode.com/">PubSubHubBub</a> hub.'));
+ 
+         return true;
+     }
  }