aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-20 22:52:47 -0700
committerredmatrix <git@macgirvin.com>2016-05-20 22:52:47 -0700
commitd8ace38041ad3ef161cf9c727c94b6ce2a00ce75 (patch)
tree80326bb033ded557c846cecafba3882459f20906 /include/conversation.php
parentbc20cf9fa3479be20417f78187f7302f13fbf0ec (diff)
downloadvolse-hubzilla-d8ace38041ad3ef161cf9c727c94b6ce2a00ce75.tar.gz
volse-hubzilla-d8ace38041ad3ef161cf9c727c94b6ce2a00ce75.tar.bz2
volse-hubzilla-d8ace38041ad3ef161cf9c727c94b6ce2a00ce75.zip
rework the conversation object stuff at a high level - still needs a bit of refactoring
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 8be0557e7..fca07a91d 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -754,10 +754,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
// Normal View
// logger('conv: items: ' . print_r($items,true));
- require_once('include/ConversationObject.php');
- require_once('include/ItemObject.php');
-
- $conv = new Conversation($mode, $preview, $prepared_item);
+ $conv = new Zotlabs\Lib\ThreadStream($mode, $preview, $prepared_item);
// In the display mode we don't have a profile owner.
@@ -806,7 +803,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
if($item['id'] == $item['parent']) {
- $item_object = new Item($item);
+ $item_object = new Zotlabs\Lib\ThreadItem($item);
$conv->add_thread($item_object);
if($page_mode === 'list') {
$item_object->set_template('conv_list.tpl');