* fix bug for model merge hook and setClientTheme.

2016-03-16 14:42:15 +08:00
parent 05f7a04679
commit cb601c8e91
2 changed files with 3 additions and 3 deletions
@@ -981,7 +981,7 @@ class baseRouter
        if(!empty($this->clientTheme))
        {
            $this->clientTheme = strtolower($this->clientTheme);
-            if(!isset($this->config->themes[$this->clientTheme])) $this->clientTheme = $this->config->default->theme;
+            if(!isset($this->lang->themes[$this->clientTheme])) $this->clientTheme = $this->config->default->theme;
        }    
        else
        {