fix dupe bug in content hooks

This commit is contained in:
M.Dent 2017-12-23 10:58:51 -05:00 committed by Mario
parent 259f425050
commit 34d28e7ba9

View File

@ -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']);
}
}
}
}
}