From 6ec4c202d5b813e914d9432d9034ed2d7c421991 Mon Sep 17 00:00:00 2001
From: tao-s <tao@xross-cube.com>
Date: Fri, 13 Dec 2019 02:39:10 +0900
Subject: [PATCH] =?UTF-8?q?URL=E3=81=8B=E3=82=89user=5Fdata=E6=B6=88?=
 =?UTF-8?q?=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/config/eccube/packages/eccube.yaml       | 2 +-
 app/config/eccube/routes.yaml                | 7 +++++++
 src/Eccube/Controller/UserDataController.php | 4 +++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/config/eccube/packages/eccube.yaml b/app/config/eccube/packages/eccube.yaml
index 907d1c51d27..3549d346008 100644
--- a/app/config/eccube/packages/eccube.yaml
+++ b/app/config/eccube/packages/eccube.yaml
@@ -1,7 +1,7 @@
 parameters:
     # EC-CUBE default env parameters
     env(ECCUBE_ADMIN_ROUTE): 'admin'
-    env(ECCUBE_USER_DATA_ROUTE): 'user_data'
+    env(ECCUBE_USER_DATA_ROUTE): ''
     env(ECCUBE_ADMIN_ALLOW_HOSTS): '[]'
     env(ECCUBE_FORCE_SSL): false
     env(ECCUBE_TEMPLATE_CODE): 'default'
diff --git a/app/config/eccube/routes.yaml b/app/config/eccube/routes.yaml
index 071f74be27c..1ddffac8f16 100644
--- a/app/config/eccube/routes.yaml
+++ b/app/config/eccube/routes.yaml
@@ -28,3 +28,10 @@ admin_logout:
     path: '/%eccube_admin_route%/logout'
 logout:
     path: /logout
+user_data:
+    path: /{route}
+    requirements:
+         route: '([0-9a-zA-Z_\-]+\/?)+(?<!\/)'
+    defaults:
+        _controller: Eccube\Controller\UserDataController::index
+
diff --git a/src/Eccube/Controller/UserDataController.php b/src/Eccube/Controller/UserDataController.php
index 80a05839cd2..99d4619e68d 100644
--- a/src/Eccube/Controller/UserDataController.php
+++ b/src/Eccube/Controller/UserDataController.php
@@ -49,7 +49,9 @@ public function __construct(
     }
 
     /**
-     * @Route("/%eccube_user_data_route%/{route}", name="user_data", requirements={"route": "([0-9a-zA-Z_\-]+\/?)+(?<!\/)"})
+     * Display user added pages
+     * @param Request $request
+     * @param string $route
      */
     public function index(Request $request, $route)
     {