Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / actions / shownotice.php

diff --git a/actions/shownotice.php b/actions/shownotice.php
index c5180568b3aa5dd5c56c37bd955ea3fb5ac11c40..5b3ec93de10b64082bceb30bc5de46a4c3693c2d 100644 (file)
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -278,12 +278,6 @@ class ShownoticeAction extends OwnerDesignAction
                                          'content' => $id->toString()));
         }
 
-        if ($user->jabbermicroid && $user->jabber && $this->notice->uri) {
-            $id = new Microid('xmpp:', $user->jabber,
-                              $this->notice->uri);
-            $this->element('meta', array('name' => 'microid',
-                                         'content' => $id->toString()));
-        }
         $this->element('link',array('rel'=>'alternate',
             'type'=>'application/json+oembed',
             'href'=>common_local_url(
@@ -311,7 +305,7 @@ class ShownoticeAction extends OwnerDesignAction
     }
 }
 
-class SingleNoticeItem extends NoticeListItem
+class SingleNoticeItem extends DoFollowListItem
 {
     /**
      * recipe function for displaying a single notice.