Merge remote-tracking branch 'upstream/master'

1 files changed, 5 insertions, 3 deletions

diff --git a/index.php b/index.php
index 6ed7eeb11..c864a7b37 100755
--- a/index.php
+++ b/index.php
@@ -336,11 +336,13 @@ if($a->module_loaded) {
 	}
 
 	if((! $a->error) && (function_exists($a->module . '_content'))) {
-		$arr = array('content' => $a->page['content']);
+		$arr = array('content' => $a->page['content'], 'replace' => false);
 		call_hooks($a->module . '_mod_content', $arr);
 		$a->page['content'] = $arr['content'];
-		$func = $a->module . '_content';
-		$arr = array('content' => $func($a));
+		if(! $arr['replace']) {
+			$func = $a->module . '_content';
+			$arr = array('content' => $func($a));
+		}
 		call_hooks($a->module . '_mod_aftercontent', $arr);
 		$a->page['content'] .= $arr['content'];
 	}