Event upgraded to microformats2

[quix0rs-gnu-social.git] / plugins / EmailSummary / lib / useremailsummaryhandler.php

diff --git a/plugins/EmailSummary/lib/useremailsummaryhandler.php b/plugins/EmailSummary/lib/useremailsummaryhandler.php
index 01f6ca826424425804f2ed452d92cfdb18cda709..fe814a3fb5ba0610b5547a980f4ae63381c1b263 100644 (file)
--- a/plugins/EmailSummary/lib/useremailsummaryhandler.php
+++ b/plugins/EmailSummary/lib/useremailsummaryhandler.php
@@ -102,7 +102,8 @@ class UserEmailSummaryHandler extends QueueHandler
             return true;
         }
 
-        $stream = new InboxNoticeStream($user, $user->getProfile());
+        // An InboxNoticeStream for a certain user, scoped to its own view
+        $stream = new InboxNoticeStream($profile, $profile);
 
         $notice = $stream->getNotices(0, self::MAX_NOTICES, $since_id);
 
@@ -172,7 +173,7 @@ class UserEmailSummaryHandler extends QueueHandler
             $out->text(' ');
             $out->raw($notice->rendered);
             $out->elementStart('div', array('style' => 'font-size: 0.8em; padding-top: 4px;'));
-            $noticeurl = $notice->bestUrl();
+            $noticeurl = $notice->getUrl();
             // above should always return an URL
             assert(!empty($noticeurl));
             $out->elementStart('a', array('rel' => 'bookmark',
@@ -182,17 +183,9 @@ class UserEmailSummaryHandler extends QueueHandler
                                         'title' => $dt),
                           common_date_string($notice->created));
             $out->elementEnd('a');
-            if ($notice->hasConversation()) {
-                $conv = Conversation::getKV('id', $notice->conversation);
-                $convurl = $conv->uri;
-                if (!empty($convurl)) {
-                    $out->text(' ');
-                    $out->element('a',
-                                  array('href' => $convurl.'#notice-'.$notice->id),
-                                  // TRANS: Link text for link to conversation view.
-                                  _m('in context'));
-                }
-            }
+            $out->element('a', array('href' => $notice->getConversationUrl()),
+                          // TRANS: Link text for link to conversation view.
+                          _m('in context'));
             $out->elementEnd('div');
             $out->elementEnd('td');
             $out->elementEnd('tr');