Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / GNUsocialProfileExtensions / lib / noticetree.php

diff --git a/plugins/GNUsocialProfileExtensions/lib/noticetree.php b/plugins/GNUsocialProfileExtensions/lib/noticetree.php
index bdf9d32de93aadced0c503895f0ad381a4a0f7e1..380672ebb535d688dafeaf7f1a216d68a61c00f1 100644 (file)
--- a/plugins/GNUsocialProfileExtensions/lib/noticetree.php
+++ b/plugins/GNUsocialProfileExtensions/lib/noticetree.php
@@ -73,7 +73,7 @@ class NoticeTree extends NoticeList
 
         // We take responsibility for doing the li
 
-        $this->out->elementStart('li', array('class' => 'hentry notice',
+        $this->out->elementStart('li', array('class' => 'h-entry notice',
                                              'id' => 'notice-' . $item->notice->id));
 
         $item->show();
@@ -103,7 +103,7 @@ class NoticeTree extends NoticeList
         $this->out->elementEnd('li');
     }
 
-    function newListItem($notice)
+    function newListItem(Notice $notice)
     {
         return new NoticeTreeItem($notice, $this->out);
     }
@@ -146,11 +146,6 @@ class NoticeTreeItem extends NoticeListItem
         return;
     }
 
-    function showContext()
-    {
-        return;
-    }
-
     //Just changing the link...
     function showReplyLink()
     {
@@ -206,7 +201,7 @@ class ReplyForm extends NoticeForm
             }
             $this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
 
-            if ($this->user->shareLocation()) {
+            if ($this->profile->shareLocation()) {
                 $this->out->hidden('notice_data-lat', empty($this->lat) ? (empty($this->profile->lat) ? null : $this->profile->lat) : $this->lat, 'lat');
                 $this->out->hidden('notice_data-lon', empty($this->lon) ? (empty($this->profile->lon) ? null : $this->profile->lon) : $this->lon, 'lon');
                 $this->out->hidden('notice_data-location_id', empty($this->location_id) ? (empty($this->profile->location_id) ? null : $this->profile->location_id) : $this->location_id, 'location_id');
@@ -225,4 +220,4 @@ class ReplyForm extends NoticeForm
             Event::handle('EndShowNoticeFormData', array($this));
         }
     }
-}
\ No newline at end of file
+}