From f65fd952aa280e49bc77e51a961e834db0ff19e8 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 25 Mar 2022 14:13:07 +0900
Subject: [PATCH] Fix #1911 reinitialize $_m after running each addon

---
 modules/addon/addon.controller.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php
index 82e17ad89..59288c6eb 100644
--- a/modules/addon/addon.controller.php
+++ b/modules/addon/addon.controller.php
@@ -72,7 +72,7 @@ class addonController extends addon
 	function makeCacheFile($site_srl = 0, $type = "pc", $gtype = 'site')
 	{
 		// Add-on module for use in creating the cache file
-		$buff = array('<?php if(!defined("__XE__")) exit();', '$_m = Context::get(\'mid\');');
+		$buff = array('<?php if(!defined("__XE__")) exit();');
 		$oAddonModel = getAdminModel('addon');
 		$addon_list = $oAddonModel->getInsertedAddons($site_srl, $gtype);
 		foreach($addon_list as $addon => $val)
@@ -105,6 +105,7 @@ class addonController extends addon
 			$run_method = ($extra_vars->xe_run_method ?? null) ?: 'run_selected';
 			$buff[] = '$rm = \'' . $run_method . "';";
 			$buff[] = '$ml = ' . var_export(array_fill_keys($mid_list, true), true) . ';';
+			$buff[] = '$_m = Context::get(\'mid\');';
 			
 			// Addon filename
 			$buff[] = sprintf('$addon_file = RX_BASEDIR . \'addons/%s/%s.addon.php\';', $addon, $addon);