From 2dd78849cf35a5d3ebc6e99ca83c3fc941531d71 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Fri, 22 Nov 2019 20:58:56 +0900
Subject: [PATCH] Import miscellaneous fixes from XE 1.11.6

---
 modules/addon/addon.admin.model.php | 2 +-
 modules/trash/tpl/trash_view.html   | 2 +-
 modules/widget/widget.view.php      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/addon/addon.admin.model.php b/modules/addon/addon.admin.model.php
index 4e6e3acaa..8cb1c21bc 100644
--- a/modules/addon/addon.admin.model.php
+++ b/modules/addon/addon.admin.model.php
@@ -86,7 +86,7 @@ class addonAdminModel extends addon
 		// Wanted to add a list of activated
 		$inserted_addons = $this->getInsertedAddons($site_srl, $gtype);
 		// Downloaded and installed add-on to the list of Wanted
-		$searched_list = FileHandler::readDir('./addons', '/^([a-zA-Z0-9-_]+)$/');
+		$searched_list = FileHandler::readDir('./addons', '/^([a-zA-Z0-9_]+)$/');
 		$searched_count = count($searched_list);
 		if(!$searched_count)
 		{
diff --git a/modules/trash/tpl/trash_view.html b/modules/trash/tpl/trash_view.html
index b1292c1a9..00d87c3f4 100644
--- a/modules/trash/tpl/trash_view.html
+++ b/modules/trash/tpl/trash_view.html
@@ -53,7 +53,7 @@
 
 	<tr>
 		<th scope="row">{$lang->content}</th>
-		<td class="text">{$oOrigin->content}</td>
+		<td class="text">{$oOrigin->content|noescape}</td>
 	</tr>
 </table>
 
diff --git a/modules/widget/widget.view.php b/modules/widget/widget.view.php
index 5d4272ced..c911e271c 100644
--- a/modules/widget/widget.view.php
+++ b/modules/widget/widget.view.php
@@ -38,7 +38,7 @@ class widgetView extends widget
 	function dispWidgetSkinInfo()
 	{
 		$widget = Context::get('selected_widget');
-		$skin = Context::get('skin');
+		$skin = preg_replace('/[^a-zA-Z0-9-_]/', '', Context::get('skin'));
 
 		$path = sprintf('./widgets/%s/', $widget);
 		// Wanted widget is selected information