1 files changed, 8 insertions, 3 deletions
diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index 80434aca4c..648af61c00 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -90,7 +90,7 @@ class template
 	* Set custom template location (able to use directory outside of phpBB)
 	* @access public
 	*/
-	function set_custom_template($template_path, $template_name)
+	function set_custom_template($template_path, $template_name, $template_mode = 'template')
 	{
 		global $phpbb_root_path, $user;
 
@@ -102,8 +102,13 @@ class template
 
 		$this->root = $template_path;
 		$this->cachepath = $phpbb_root_path . 'cache/ctpl_' . str_replace('_', '-', $template_name) . '_';
-		$user->theme['template_storedb'] = false;
-		$user->theme['template_inherits_id'] = false;
+
+		// As the template-engine is used for more than the template (emails, etc.), we should not set $user->theme in all cases, but only on the real template.
+		if ($template_mode == 'template')
+		{
+			$user->theme['template_storedb'] = false;
+			$user->theme['template_inherits_id'] = false;
+		}
 
 		$this->_rootref = &$this->_tpldata['.'][0];