From af7b852d04eb2a255eafb38a9dae5d554be1a1bb Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 19 Jan 2019 21:52:43 -0500
Subject: [PATCH] Insert theme init after module init but before post/content

---
 src/App.php | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/App.php b/src/App.php
index 26c93b250..bc8b444db 100644
--- a/src/App.php
+++ b/src/App.php
@@ -1720,13 +1720,7 @@ class App
 
 		$content = '';
 
-		// Load current theme info after module has been executed as theme could have been set in module
-		$theme_info_file = 'view/theme/' . $this->getCurrentTheme() . '/theme.php';
-		if (file_exists($theme_info_file)) {
-			require_once $theme_info_file;
-		}
-
-		// Call module functions
+		// Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
 		if ($this->module_loaded) {
 			$this->page['page_title'] = $this->module;
 			$placeholder = '';
@@ -1734,18 +1728,26 @@ class App
 			Core\Addon::callHooks($this->module . '_mod_init', $placeholder);
 
 			call_user_func([$this->module_class, 'init']);
+		}
 
+		// Load current theme info after module has been initialized as theme could have been set in module
+		$theme_info_file = 'view/theme/' . $this->getCurrentTheme() . '/theme.php';
+		if (file_exists($theme_info_file)) {
+			require_once $theme_info_file;
+		}
+
+		if (function_exists(str_replace('-', '_', $this->getCurrentTheme()) . '_init')) {
+			$func = str_replace('-', '_', $this->getCurrentTheme()) . '_init';
+			$func($this);
+		}
+
+		if ($this->module_loaded) {
 			// "rawContent" is especially meant for technical endpoints.
 			// This endpoint doesn't need any theme initialization or other comparable stuff.
 			if (!$this->error) {
 				call_user_func([$this->module_class, 'rawContent']);
 			}
 
-			if (function_exists(str_replace('-', '_', $this->getCurrentTheme()) . '_init')) {
-				$func = str_replace('-', '_', $this->getCurrentTheme()) . '_init';
-				$func($this);
-			}
-
 			if (! $this->error && $_SERVER['REQUEST_METHOD'] === 'POST') {
 				Core\Addon::callHooks($this->module . '_mod_post', $_POST);
 				call_user_func([$this->module_class, 'post']);