OAuth related syntax fixes, nothing big

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

diff --git a/actions/conversation.php b/actions/conversation.php
index 637e86e4b26eb95b8d26cdb429878ab76314f856..aa2539d213d4a49fcbc07e54480db4d9a78610c4 100644 (file)
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -123,9 +123,15 @@ class ConversationAction extends Action
      */
     function showContent()
     {
-        $tnl = new FullThreadedNoticeList($this->notices, $this, $this->userProfile);
+        $user = common_current_user();
 
-        $cnt = $tnl->show();
+        if (!empty($user) && $user->conversationTree()) {
+            $nl = new ConversationTree($this->notices, $this);
+        } else {
+            $nl = new FullThreadedNoticeList($this->notices, $this, $this->userProfile);
+        }
+
+        $cnt = $nl->show();
     }
 
     function isReadOnly()
@@ -162,3 +168,4 @@ class ConversationAction extends Action
                               _('Conversation feed (Activity Streams JSON)')));
     }
 }
+