clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Move Objects to Model"

Browse Source
This commit is contained in:
Michael Vogel
2017-12-08 05:21:51 +01:00
committed by GitHub
parent e437c74d0e
commit 5747cfc79c
77 changed files with 593 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/conversation.php
View File

@@ -8,8 +8,8 @@ use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Contact;
use Friendica\Object\Thread;
use Friendica\Object\Contact;
use Friendica\Object\Conversation;
use Friendica\Object\Item;
require_once "include/bbcode.php";
@@ -840,7 +840,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
// Normal View
$page_template = get_markup_template("threaded_conversation.tpl");
$conv = new Thread($mode, $preview);
$conv = new Conversation($mode, $preview);
/*
* get all the topmost parents
@@ -881,7 +881,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
if ($item['id'] == $item['parent']) {
$item_object = new Item($item);
$conv->addParent($item_object);
$conv->addThread($item_object);
}
}