From b85198eef6a1808c7a7ed4e886a90a832810d43d Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 31 Jul 2019 17:15:57 +0800
Subject: [PATCH]  * finish task #8395.

---
 framework/router.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/framework/router.class.php b/framework/router.class.php
index abed1a2cd9..68ab4b8596 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -112,8 +112,10 @@ class router extends baseRouter
                 $productProject = $productProject->value;
                 list($productCommon, $projectCommon) = explode('_', $productProject);
             }
-            $lang->productCommon = isset($this->config->productCommonList[$this->clientLang][(int)$productCommon]) ? $this->config->productCommonList[$this->clientLang][(int)$productCommon] : $this->config->productCommonList['en'][0];
-            $lang->projectCommon = isset($this->config->projectCommonList[$this->clientLang][(int)$projectCommon]) ? $this->config->projectCommonList[$this->clientLang][(int)$projectCommon] : $this->config->projectCommonList['en'][0];
+
+            /* Set productCommon and projectCommon. Default english lang. */
+            $lang->productCommon = isset($this->config->productCommonList[$this->clientLang][(int)$productCommon]) ? $this->config->productCommonList[$this->clientLang][(int)$productCommon] : $this->config->productCommonList['en'][(int)$productCommon];
+            $lang->projectCommon = isset($this->config->projectCommonList[$this->clientLang][(int)$projectCommon]) ? $this->config->projectCommonList[$this->clientLang][(int)$projectCommon] : $this->config->projectCommonList['en'][(int)$projectCommon];
         }
 
         parent::loadLang($moduleName, $appName);