diff options
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Pconfig.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Module/Zot.php | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 93d8aa3a5..98fb5c268 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -39,6 +39,9 @@ class ThreadItem { $this->data = $data; $this->toplevel = ($this->get_id() == $this->get_data_value('parent')); + $conv = $this->get_conversation(); + $observer = $conv->get_observer(); + // Prepare the children if($data['children']) { foreach($data['children'] as $item) { @@ -51,6 +54,7 @@ class ThreadItem { continue; } + $child = new ThreadItem($item); $this->add_child($child); } diff --git a/Zotlabs/Module/Pconfig.php b/Zotlabs/Module/Pconfig.php index 7c82bac7d..44fe5d9a9 100644 --- a/Zotlabs/Module/Pconfig.php +++ b/Zotlabs/Module/Pconfig.php @@ -43,7 +43,7 @@ class Pconfig extends \Zotlabs\Web\Controller { } - function get() { + function get() { if(! local_channel()) { return login(); diff --git a/Zotlabs/Module/Zot.php b/Zotlabs/Module/Zot.php index 8c34dced1..1cc0e54c9 100644 --- a/Zotlabs/Module/Zot.php +++ b/Zotlabs/Module/Zot.php @@ -19,7 +19,7 @@ class Zot extends \Zotlabs\Web\Controller { function init() { $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'); } } |