From 72c2b93790e1fe1d7205bcfc40ec60c3b1b31e01 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Mon, 7 Nov 2022 01:45:32 +0900 Subject: [PATCH] Fix #2011 #2012 convert lang path before calling pathinfo() --- classes/display/HTMLDisplayHandler.php | 1 + classes/template/TemplateHandler.class.php | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php index b9ac04712..14cf712cb 100644 --- a/classes/display/HTMLDisplayHandler.php +++ b/classes/display/HTMLDisplayHandler.php @@ -33,6 +33,7 @@ class HTMLDisplayHandler public static $replacements = array( '@\bcommon/xeicon/@' => 'common/css/xeicon/', '@\beditor/skins/xpresseditor/js/xe_textarea\.(?:min\.)?js@' => 'editor/skins/ckeditor/js/xe_textarea.js', + '@/lang$@' => '/lang/lang.xml', ); /** diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php index 4f2920f00..b728c4e5f 100644 --- a/classes/template/TemplateHandler.class.php +++ b/classes/template/TemplateHandler.class.php @@ -891,13 +891,6 @@ class TemplateHandler $relativeDir = $this->_getRelativeDir($pathinfo['dirname']); $attr['target'] = $relativeDir . '/' . $pathinfo['basename']; } - - if(substr($attr['target'], -5) == '/lang') - { - $pathinfo['dirname'] .= '/lang'; - $pathinfo['basename'] = ''; - $pathinfo['extension'] = 'xml'; - } } switch($pathinfo['extension'])