From 7aaa1973f492c3505b132a1f6af6c897fa6e0581 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 19 Nov 2018 15:04:08 -0800 Subject: push recent changes --- Zotlabs/Lib/ThreadItem.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Zotlabs/Lib/ThreadItem.php') 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); } -- cgit v1.2.3 From 6481c9dca18d5b0e09e495b30edff987ac2da0b5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 19 Nov 2018 15:20:28 -0800 Subject: use this form instead --- Zotlabs/Lib/ThreadItem.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Zotlabs/Lib/ThreadItem.php') diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 98fb5c268..83d243177 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -39,8 +39,7 @@ class ThreadItem { $this->data = $data; $this->toplevel = ($this->get_id() == $this->get_data_value('parent')); - $conv = $this->get_conversation(); - $observer = $conv->get_observer(); + $observer = \App::get_observer(); // Prepare the children if($data['children']) { -- cgit v1.2.3