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 7cc6c54243ac2e1e80493e210c173d2fb140e0c0..6534617319d07c5aaa33db6bc0b1ae10cf9d6e3c 100644 (file)
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -274,12 +274,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(