From 994cb810efb7504f97285b38b277d400ef729507 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Mon, 28 Feb 2022 14:41:44 +0800
Subject: [PATCH] * Fix xuan extension.

---
 framework/base/control.class.php | 6 ++++++
 framework/base/router.class.php  | 1 +
 2 files changed, 7 insertions(+)

diff --git a/framework/base/control.class.php b/framework/base/control.class.php
index 5f693c0663..8246a8a1a1 100644
--- a/framework/base/control.class.php
+++ b/framework/base/control.class.php
@@ -792,6 +792,12 @@ class baseControl
                 if(file_exists($commonActionExtFile)) $file2Included = $commonActionExtFile;
             }
 
+            if(!empty($actionExtPath['xuan']))
+            {
+                $commonActionExtFile = $actionExtPath['xuan'] . strtolower($methodName) . '.php';
+                if(file_exists($commonActionExtFile)) $file2Included = $commonActionExtFile;
+            }
+
             if(!empty($actionExtPath['common']))
             {
                 $commonActionExtFile = $actionExtPath['common'] . strtolower($methodName) . '.php';
diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index b057e50c31..d80750358c 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -2308,6 +2308,7 @@ class baseRouter
         if($config->framework->extensionLevel >= 1)
         {
             if(!empty($extConfigPath['common'])) $commonExtConfigFiles = helper::ls($extConfigPath['common'], '.php');
+            if(!empty($extConfigPath['xuan']))   $commonExtConfigFiles = array_merge($commonExtConfigFiles, helper::ls($extConfigPath['xuan'], '.php'));
             if(!empty($extConfigPath['vision'])) $commonExtConfigFiles = array_merge($commonExtConfigFiles, helper::ls($extConfigPath['vision'], '.php'));
             if(!empty($extConfigPath['custom'])) $commonExtConfigFiles = array_merge($commonExtConfigFiles, helper::ls($extConfigPath['custom'], '.php'));
         }