From 5daa6636a679539ebc4e3d24f420a032f676adf7 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sun, 5 May 2024 15:55:51 +0900 Subject: [PATCH] Fix redirect to invalid page after layout reset --- modules/layout/layout.admin.controller.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php index ed22ffa14..2abf56ebd 100644 --- a/modules/layout/layout.admin.controller.php +++ b/modules/layout/layout.admin.controller.php @@ -351,7 +351,11 @@ class LayoutAdminController extends Layout $this->initLayout($layout_srl, $info->layout); $this->setMessage('success_reset'); - $this->setRedirectUrl(Context::get('error_return_url')); + $this->setRedirectUrl(getNotEncodedUrl([ + 'module' => 'admin', + 'act' => 'dispLayoutAdminAllInstanceList', + 'type' => starts_with('./m.layouts/', $info->path) ? 'M' : '', + ])); } /**