diff options
| author | git-marijus <mario@mariovavti.com> | 2017-12-27 16:50:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-27 16:50:17 +0100 |
| commit | ab1dec813b48298903633d7e8e8e6c2f9ce2d120 (patch) | |
| tree | 50221aaeef569cbbb2f5a15d3d9c12fb3a58859b /Zotlabs/Web/Router.php | |
| parent | 4a71fb08315b2b785114d90318adb51f6fa78472 (diff) | |
| parent | ef952a41b3af7af60c4c3329428c9503c2f39333 (diff) | |
| download | volse-hubzilla-ab1dec813b48298903633d7e8e8e6c2f9ce2d120.tar.gz volse-hubzilla-ab1dec813b48298903633d7e8e8e6c2f9ce2d120.tar.bz2 volse-hubzilla-ab1dec813b48298903633d7e8e8e6c2f9ce2d120.zip | |
Merge pull request #944 from dentm42/fix-dupe-bug-in-content-hooks
Fix dupe bug in content hooks
Diffstat (limited to 'Zotlabs/Web/Router.php')
| -rw-r--r-- | Zotlabs/Web/Router.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php index 12ef315d4..a6b780cdc 100644 --- a/Zotlabs/Web/Router.php +++ b/Zotlabs/Web/Router.php @@ -265,7 +265,7 @@ 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()); @@ -276,8 +276,8 @@ class Router { } } call_hooks(\App::$module . '_mod_aftercontent', $arr); - \App::$page['content'] .= $arr['content']; + \App::$page['content'] = (($arr['replace']) ? $arr['content'] : \App::$page['content'] . $arr['content']); } } } -}
\ No newline at end of file +} |