diff options
| author | Mario <mario@mariovavti.com> | 2018-11-22 10:17:18 +0100 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-11-22 10:17:18 +0100 |
| commit | 85f52d2aeda44072013b9af5bfd470fbf47c2769 (patch) | |
| tree | c70da697b7aba9d3befeaf9330db6ef8a9619b2a | |
| parent | e30be643c9f217dc379aac0feb085a1b1ffa44e1 (diff) | |
| parent | ea235c0c6751b682332b968b4c18f905e8ece451 (diff) | |
| download | volse-hubzilla-85f52d2aeda44072013b9af5bfd470fbf47c2769.tar.gz volse-hubzilla-85f52d2aeda44072013b9af5bfd470fbf47c2769.tar.bz2 volse-hubzilla-85f52d2aeda44072013b9af5bfd470fbf47c2769.zip | |
Merge remote-tracking branch 'mike/master' into dev
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Module/Pconfig.php | 2 | ||||
| -rwxr-xr-x | include/items.php | 8 |
3 files changed, 8 insertions, 5 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 93d8aa3a5..83d243177 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -39,6 +39,8 @@ class ThreadItem { $this->data = $data; $this->toplevel = ($this->get_id() == $this->get_data_value('parent')); + $observer = \App::get_observer(); + // Prepare the children if($data['children']) { foreach($data['children'] as $item) { @@ -51,6 +53,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/include/items.php b/include/items.php index 8268d3fe7..5346a141b 100755 --- a/include/items.php +++ b/include/items.php @@ -2662,7 +2662,7 @@ function tag_deliver($uid, $item_id) { if(preg_match_all($pluspattern,$body,$matches,PREG_SET_ORDER)) { foreach($matches as $match) { $matched_forums ++; - if($term['url'] === $match[1] && $term['term'] === $match[2] && intval($term['ttype']) === TERM_MENTION) { + if($term['url'] === $match[1] && intval($term['ttype']) === TERM_MENTION) { if($matched_forums <= $max_forums) { $plustagged = true; $found = true; @@ -2676,7 +2676,7 @@ function tag_deliver($uid, $item_id) { if(preg_match_all($forumpattern,$body,$matches,PREG_SET_ORDER)) { foreach($matches as $match) { $matched_forums ++; - if($term['url'] === $match[1] && $term['term'] === $match[2] && intval($term['ttype']) === TERM_FORUM) { + if($term['url'] === $match[1] && intval($term['ttype']) === TERM_FORUM) { if($matched_forums <= $max_forums) { $plustagged = true; $found = true; @@ -2912,7 +2912,7 @@ function tgroup_check($uid, $item) { if(preg_match_all($pluspattern,$body,$matches,PREG_SET_ORDER)) { foreach($matches as $match) { $matched_forums ++; - if($term['url'] === $match[1] && $term['term'] === $match[2] && intval($term['ttype']) === TERM_MENTION) { + if($term['url'] === $match[1] && intval($term['ttype']) === TERM_MENTION) { if($matched_forums <= $max_forums) { $found = true; break; @@ -2925,7 +2925,7 @@ function tgroup_check($uid, $item) { if(preg_match_all($forumpattern,$body,$matches,PREG_SET_ORDER)) { foreach($matches as $match) { $matched_forums ++; - if($term['url'] === $match[1] && $term['term'] === $match[2] && intval($term['ttype']) === TERM_FORUM) { + if($term['url'] === $match[1] && intval($term['ttype']) === TERM_FORUM) { if($matched_forums <= $max_forums) { $found = true; break; |