From 70c2bfe5df45deb1567dab7f5ceec14f94b7227b Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 18 Dec 2020 00:54:34 +0900
Subject: [PATCH] Remove deleted routes from action_forward table

---
 modules/module/module.controller.php | 17 +++++++++++++++++
 modules/module/module.model.php      | 13 +++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php
index 730be2456..8a7363533 100644
--- a/modules/module/module.controller.php
+++ b/modules/module/module.controller.php
@@ -1414,6 +1414,23 @@ class moduleController extends module
 			}
 		}
 		
+		// Clean up any action-forward routes that are no longer needed.
+		foreach ($forwardable_routes as $action_name => $route_info)
+		{
+			unset($action_forward[$action_name]);
+		}
+		foreach ($action_forward as $action_name => $forward_info)
+		{
+			if ($forward_info->module === $module_name && $forward_info->route_regexp !== null)
+			{
+				$output = $this->deleteActionForward($module_name, null, $action_name);
+				if (!$output->toBool())
+				{
+					return $output;
+				}
+			}
+		}
+		
 		return new BaseObject();
 	}
 }
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index ca0bed9e8..b26d45085 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -1524,6 +1524,19 @@ class moduleModel extends module
 						$info->need_update = true;
 					}
 				}
+				
+				// Clean up any action-forward routes that are no longer needed.
+				foreach ($forwardable_routes as $action_name => $route_info)
+				{
+					unset($action_forward[$action_name]);
+				}
+				foreach ($action_forward as $action_name => $forward_info)
+				{
+					if ($forward_info->module === $module_name && $forward_info->route_regexp !== null)
+					{
+						$info->need_update = true;
+					}
+				}
 			}
 			$list[] = $info;
 		}