From a390e3e888b4e78818ce5c5d0315b4128939c2d1 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 18 Mar 2011 15:00:02 -0700
Subject: [PATCH] Fixes for GroupPrivateMessage, OStatus due to changes in
 group output events, and some internal bugs using wrong vars

---
 .../GroupPrivateMessagePlugin.php                    |  6 ++++--
 .../GroupPrivateMessage/Group_message_profile.php    | 12 +++++-------
 plugins/OStatus/OStatusPlugin.php                    |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
index 09fd1d7bfa..42a8a5d573 100644
--- a/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
+++ b/plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
@@ -348,14 +348,15 @@ class GroupPrivateMessagePlugin extends Plugin
     /**
      * To add a "Message" button to the group profile page
      *
-     * @param Action     $action The showgroup action being shown
+     * @param Widget     $widget The showgroup action being shown
      * @param User_group $group  The current group
      * 
      * @return boolean hook value
      */
-    function onEndGroupActionsList($action, $group)
+    function onEndGroupActionsList($widget, $group)
     {
         $cur = common_current_user();
+        $action = $widget->out;
 
         if (empty($cur)) {
             return true;
@@ -402,6 +403,7 @@ class GroupPrivateMessagePlugin extends Plugin
         $ignored = array();
 
         $forcePrivate = false;
+        $profile = $notice->getProfile();
 
         if ($count > 0) {
 
diff --git a/plugins/GroupPrivateMessage/Group_message_profile.php b/plugins/GroupPrivateMessage/Group_message_profile.php
index bd778b815a..c5832a9294 100644
--- a/plugins/GroupPrivateMessage/Group_message_profile.php
+++ b/plugins/GroupPrivateMessage/Group_message_profile.php
@@ -156,9 +156,7 @@ class Group_message_profile extends Memcached_DataObject
 
         // TRANS: Subject for direct-message notification email.
         // TRANS: %s is the sending user's nickname.
-        $subject = sprintf(_('New private message from %s to group %s'), $from->nickname, $group->nickname);
-
-        $from_profile = $from->getProfile();
+        $subject = sprintf(_('New private message from %s to group %s'), $from_profile->nickname, $group->nickname);
 
         // TRANS: Body for direct-message notification email.
         // TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
@@ -174,13 +172,13 @@ class Group_message_profile extends Memcached_DataObject
                           "With kind regards,\n".
                           "%6\$s\n"),
                         $from_profile->getBestName(),
-                        $from->nickname,
+                        $from_profile->nickname,
                         $group->nickname,
-                        $this->content,
-                        common_local_url('newmessage', array('to' => $from->id)),
+                        $gm->content,
+                        common_local_url('newmessage', array('to' => $from_profile->id)),
                         common_config('site', 'name'));
 
-        $headers = _mail_prepare_headers('message', $to->nickname, $from->nickname);
+        $headers = _mail_prepare_headers('message', $to->nickname, $from_profile->nickname);
 
         common_switch_locale();
 
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index ef9a39a377..738481149c 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -228,7 +228,7 @@ class OStatusPlugin extends Plugin
         return false;
     }
 
-    function onStartGroupSubscribe($output, $group)
+    function onStartGroupSubscribe($widget, $group)
     {
         $cur = common_current_user();
 
@@ -236,7 +236,7 @@ class OStatusPlugin extends Plugin
             // Add an OStatus subscribe
             $url = common_local_url('ostatusinit',
                                     array('group' => $group->nickname));
-            $output->element('a', array('href' => $url,
+            $widget->out->element('a', array('href' => $url,
                                         'class' => 'entity_remote_subscribe'),
                                 // TRANS: Link description for link to join a remote group.
                                 _m('Join'));