From cd74950c818959d6ac6a2094eee7a314770fbfc9 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Fri, 1 Dec 2023 11:20:38 +0900 Subject: [PATCH] Fix layout and skin path in procMemberAuthAccount --- modules/member/member.controller.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php index f5c96c504..b57d12698 100644 --- a/modules/member/member.controller.php +++ b/modules/member/member.controller.php @@ -1898,18 +1898,14 @@ class MemberController extends Member } else { - $tpl_path = sprintf('%sskins/%s', $this->module_path, $config->skin ?: 'default'); - if(!Rhymix\Framework\Storage::isDirectory($tpl_path)) - { - $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default'); - } - $tpl_file = sprintf('%s/%s', $tpl_path, 'reset_password.html'); + $this->setLayoutAndTemplatePaths(Context::get('m') ? 'P' : 'M', $config); + $tpl_file = sprintf('%s%s', $this->getTemplatePath(), 'reset_password.html'); if (!Rhymix\Framework\Storage::exists($tpl_file)) { - $tpl_file = sprintf('%s/%s', $tpl_path, 'reset_password.blade.php'); + $tpl_file = sprintf('%s%s', $this->getTemplatePath(), 'reset_password.blade.php'); if (!Rhymix\Framework\Storage::exists($tpl_file)) { - $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default'); + $this->setTemplatePath(sprintf('%sskins/%s', $this->module_path, 'default')); } }