From 5869201023b8b44a637bb43a900a2b5da4f703fa Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sun, 14 Jun 2020 20:31:41 +0900
Subject: [PATCH] More fixes to XE compatible routes

---
 common/framework/router.php   | 9 ++++++---
 modules/board/conf/module.xml | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/common/framework/router.php b/common/framework/router.php
index 6eecb4439..69c21eb6c 100644
--- a/common/framework/router.php
+++ b/common/framework/router.php
@@ -223,10 +223,13 @@ class Router
         // Try XE-compatible global routes.
         if ($rewrite_level >= 1)
         {
-            $result = self::_insertRouteVars(self::_getRearrangedGlobalRoutes(), $args);
-            if ($result !== false)
+            if (!isset($args['act']) || ($args['act'] === 'rss' || $args['act'] === 'atom'))
             {
-                return $result;
+                $result = self::_insertRouteVars(self::_getRearrangedGlobalRoutes(), $args);
+                if ($result !== false)
+                {
+                    return $result;
+                }
             }
         }
         
diff --git a/modules/board/conf/module.xml b/modules/board/conf/module.xml
index d7962d6b2..80f85709f 100644
--- a/modules/board/conf/module.xml
+++ b/modules/board/conf/module.xml
@@ -57,6 +57,7 @@
 	</grants>
 	<actions>
 		<action name="dispBoardContent" type="view" permission="list" standalone="false" index="true">
+			<route route="$document_srl:int" />
 			<route route="page/$page:int" />
 			<route route="search/$search_target/$search_keyword" />
 		</action>