diff options
| author | M.Dent <dentm42@dm42.net> | 2017-12-23 10:58:51 -0500 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-01-03 12:08:45 +0100 |
| commit | 34d28e7ba9ef8a609a126f2d0ee0e6677e9f8207 (patch) | |
| tree | c7c9b045a61b0c3596bcf5a733a452d275f9e892 /Zotlabs | |
| parent | 259f4250509de856b91ad22b865c8de3c02afc1e (diff) | |
| download | volse-hubzilla-34d28e7ba9ef8a609a126f2d0ee0e6677e9f8207.tar.gz volse-hubzilla-34d28e7ba9ef8a609a126f2d0ee0e6677e9f8207.tar.bz2 volse-hubzilla-34d28e7ba9ef8a609a126f2d0ee0e6677e9f8207.zip | |
fix dupe bug in content hooks
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Web/Router.php | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php index 12ef315d4..b1bc9655c 100644 --- a/Zotlabs/Web/Router.php +++ b/Zotlabs/Web/Router.php @@ -263,21 +263,21 @@ class Router { } if(! \App::$error) { - $arr = array('content' => \App::$page['content'], 'replace' => false); - call_hooks(\App::$module . '_mod_content', $arr); - \App::$page['content'] = $arr['content']; - if(! $arr['replace']) { - if($this->controller && method_exists($this->controller,'get')) { - $arr = array('content' => $this->controller->get()); - } - elseif(function_exists(\App::$module . '_content')) { - $func = \App::$module . '_content'; - $arr = array('content' => $func($a)); - } - } - call_hooks(\App::$module . '_mod_aftercontent', $arr); - \App::$page['content'] .= $arr['content']; + $arr = array('content' => \App::$page['content'], 'replace' => false); + call_hooks(\App::$module . '_mod_content', $arr); + + if(! $arr['replace']) { + if($this->controller && method_exists($this->controller,'get')) { + $arr = array('content' => $this->controller->get()); + } + elseif(function_exists(\App::$module . '_content')) { + $func = \App::$module . '_content'; + $arr = array('content' => $func($a)); + } + } + call_hooks(\App::$module . '_mod_aftercontent', $arr); + \App::$page['content'] = (($arr['replace']) ? $arr['content'] : \App::$page['content'] . $arr['content']); } } } -}
\ No newline at end of file +} |