diff options
| author | zotlabs <mike@macgirvin.com> | 2018-01-08 14:50:58 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-01-08 14:50:58 -0800 |
| commit | 75804d7ce57a476c85a486c807ea1f5a75235a0e (patch) | |
| tree | 13794288d5ffca739248d9ec017ef1a4cef9b93d /Zotlabs/Web | |
| parent | d4af870bb6500747790e6f196afeb4d75011185d (diff) | |
| parent | 0600817ef75d19d1ec91ba822f8a6938d442824e (diff) | |
| download | volse-hubzilla-75804d7ce57a476c85a486c807ea1f5a75235a0e.tar.gz volse-hubzilla-75804d7ce57a476c85a486c807ea1f5a75235a0e.tar.bz2 volse-hubzilla-75804d7ce57a476c85a486c807ea1f5a75235a0e.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Web')
| -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 +} |