From 00f724d0e6380f8177bcee0ff2631783f514508a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 1 Mar 2010 14:10:13 -0800
Subject: Localization tweak: include doc comments marked as 'TRANS' in .po
 file output; these should now get automatically pulled through to the
 TranslateWiki interface as translator help hints.

---
 plugins/OStatus/actions/ostatussub.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'plugins/OStatus/actions')

diff --git a/plugins/OStatus/actions/ostatussub.php b/plugins/OStatus/actions/ostatussub.php
index aae22f868..f45e6a8d1 100644
--- a/plugins/OStatus/actions/ostatussub.php
+++ b/plugins/OStatus/actions/ostatussub.php
@@ -332,6 +332,7 @@ class OStatusSubAction extends Action
         if ($this->oprofile->isGroup()) {
             $group = $this->oprofile->localGroup();
             if ($user->isMember($group)) {
+                // TRANS: OStatus remote group subscription dialog error.
                 $this->showForm(_m('Already a member!'));
                 return;
             }
@@ -341,18 +342,22 @@ class OStatusSubAction extends Action
                     Event::handle('EndJoinGroup', array($group, $user));
                     $this->successGroup();
                 } else {
+                    // TRANS: OStatus remote group subscription dialog error.
                     $this->showForm(_m('Remote group join failed!'));
                 }
             } else {
+                // TRANS: OStatus remote group subscription dialog error.
                 $this->showForm(_m('Remote group join aborted!'));
             }
         } else {
             $local = $this->oprofile->localProfile();
             if ($user->isSubscribed($local)) {
+                // TRANS: OStatus remote subscription dialog error.
                 $this->showForm(_m('Already subscribed!'));
             } elseif ($this->oprofile->subscribeLocalToRemote($user)) {
                 $this->successUser();
             } else {
+                // TRANS: OStatus remote subscription dialog error.
                 $this->showForm(_m('Remote subscription failed!'));
             }
         }
@@ -450,6 +455,7 @@ class OStatusSubAction extends Action
 
     function title()
     {
+        // TRANS: Page title for OStatus remote subscription form
         return _m('Authorize subscription');
     }
 
-- 
cgit v1.2.3-54-g00ecf


From 680ace19665f064404ddb4723d9b41ab69c6e1bd Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 1 Mar 2010 18:46:34 -0800
Subject: High-priority OStatus fixes: * PuSHing out to multiple client
 services could fail; only first callback got reached * Correction for re-sub
 request to a known sub

---
 plugins/OStatus/actions/pushhub.php | 2 +-
 plugins/OStatus/classes/HubSub.php  | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'plugins/OStatus/actions')

diff --git a/plugins/OStatus/actions/pushhub.php b/plugins/OStatus/actions/pushhub.php
index f33690bc4..842d65e7d 100644
--- a/plugins/OStatus/actions/pushhub.php
+++ b/plugins/OStatus/actions/pushhub.php
@@ -104,7 +104,7 @@ class PushHubAction extends Action
             throw new ClientException("Invalid hub.secret $secret; must be under 200 bytes.");
         }
 
-        $sub = HubSub::staticGet($sub->topic, $sub->callback);
+        $sub = HubSub::staticGet($topic, $callback);
         if (!$sub) {
             // Creating a new one!
             $sub = new HubSub();
diff --git a/plugins/OStatus/classes/HubSub.php b/plugins/OStatus/classes/HubSub.php
index e599d83a9..3120a70f9 100644
--- a/plugins/OStatus/classes/HubSub.php
+++ b/plugins/OStatus/classes/HubSub.php
@@ -260,9 +260,15 @@ class HubSub extends Memcached_DataObject
             $retries = intval(common_config('ostatus', 'hub_retries'));
         }
 
-        $data = array('sub' => clone($this),
+        // We dare not clone() as when the clone is discarded it'll
+        // destroy the result data for the parent query.
+        // @fixme use clone() again when it's safe to copy an
+        // individual item from a multi-item query again.
+        $sub = HubSub::staticGet($this->topic, $this->callback);
+        $data = array('sub' => $sub,
                       'atom' => $atom,
                       'retries' => $retries);
+        common_log(LOG_INFO, "Queuing PuSH: $this->topic to $this->callback");
         $qm = QueueManager::get();
         $qm->enqueue($data, 'hubout');
     }
-- 
cgit v1.2.3-54-g00ecf