Merge branch '0.9.x' into 1.0.x

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

diff --git a/actions/showstream.php b/actions/showstream.php
index 1f5d85ea4e9d0ac786d0c8a71391d37e6dfa33af..0fd1c2c29fc43756a3d01c446c6411e325f496f3 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -106,7 +106,7 @@ class ShowstreamAction extends ProfileAction
 
     function showLocalNav()
     {
-        $nav = new PersonalGroupNav($this);
+        $nav = new SubGroupNav($this, $this->user);
         $nav->show();
     }
 
@@ -177,12 +177,6 @@ class ShowstreamAction extends ProfileAction
             $this->element('meta', array('name' => 'microid',
                                          'content' => $id->toString()));
         }
-        if ($this->user->jabbermicroid && $this->user->jabber && $this->profile->profileurl) {
-            $id = new Microid('xmpp:'.$this->user->jabber,
-                              $this->selfUrl());
-            $this->element('meta', array('name' => 'microid',
-                                         'content' => $id->toString()));
-        }
 
         // See https://wiki.mozilla.org/Microsummaries