Merge remote-tracking branch 'upstream/master'

1 files changed, 7 insertions, 4 deletions

diff --git a/index.php b/index.php
index 7e9cde9bb..2d8116f96 100755
--- a/index.php
+++ b/index.php
@@ -289,9 +289,12 @@ if($a->module_loaded) {
 	 */
 
 	if(function_exists($a->module . '_init')) {
-		call_hooks($a->module . '_mod_init', $placeholder);
-		$func = $a->module . '_init';
-		$func($a);
+		$arr = array('init' => true, 'replace' => false);		
+		call_hooks($a->module . '_mod_init', $arr);
+		if(! $arr['replace']) {
+			$func = $a->module . '_init';
+			$func($a);
+		}
 	}
 
 	/**
@@ -333,7 +336,7 @@ if($a->module_loaded) {
 
 	if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
 		&& (function_exists($a->module . '_post'))
-		&& (! x($_POST, 'auth-params'))) {
+		&& (! x($_POST, 'auth-params'))) {		
 		call_hooks($a->module . '_mod_post', $_POST);
 		$func = $a->module . '_post';
 		$func($a);