Merge remote-tracking branch 'origin/release-20.0'

framework/router.class.php

@@ -122,9 +122,9 @@ class router extends baseRouter
      * @param   string $moduleName  the module name
      * @param   string $appName     the app name
      * @access  public
-     * @return  bool|object the lang object or false.
+     * @return  object              the lang object or false.
      */
-    public function loadLang($moduleName, $appName = ''): bool|object
+    public function loadLang($moduleName, $appName = ''): object
     {
         global $lang;
         if(!is_object($lang)) $lang = new language();
@@ -296,7 +296,7 @@ class router extends baseRouter
         $config->executionLink = 'execution-task';
 
         /* Get user preference. */
-        $account     = $this->session->user->account ?? '';
+        $account     = $_SESSION['user']->account ?? '';
         $userSetting = array();
         if($this->dbh and !empty($this->config->db->name) and $account)
         {