harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

push recent changes

Browse Source
This commit is contained in:
zotlabs 2018-11-19 15:04:08 -08:00
parent b0689614bf
commit 7aaa1973f4
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Lib/ThreadItem.php
View File

@ -39,6 +39,9 @@ class ThreadItem {
$this->data = $data; $this->data = $data;
$this->toplevel = ($this->get_id() == $this->get_data_value('parent')); $this->toplevel = ($this->get_id() == $this->get_data_value('parent'));
$conv = $this->get_conversation();
$observer = $conv->get_observer();
// Prepare the children // Prepare the children
if($data['children']) { if($data['children']) {
foreach($data['children'] as $item) { foreach($data['children'] as $item) {
@ -51,6 +54,7 @@ class ThreadItem {
continue; continue;
} }
$child = new ThreadItem($item); $child = new ThreadItem($item);
$this->add_child($child); $this->add_child($child);
} }

2
Zotlabs/Module/Pconfig.php
View File

@ -43,7 +43,7 @@ class Pconfig extends \Zotlabs\Web\Controller {
} }
function get() { function get() {
if(! local_channel()) { if(! local_channel()) {
return login(); return login();

2
Zotlabs/Module/Zot.php
View File

@ -19,7 +19,7 @@ class Zot extends \Zotlabs\Web\Controller {
function init() { function init() {
$zot = new ZotProtocol\Receiver(new ZotProtocol\Zot6Handler()); $zot = new ZotProtocol\Receiver(new ZotProtocol\Zot6Handler());
json_return_and_die($zot->run(),'application/x-zot+jzon'); json_return_and_die($zot->run(),'application/x-zot+json');
} }
} }