Merge branch 'master' of git@github.com:easysoft/zentaopms

2013-07-29 15:42:34 +08:00
parent f9523e7a39 7fc3ecfb54
commit a31c2efbf1
26 changed files with 174 additions and 64 deletions
@@ -55,7 +55,7 @@ class commonModel extends model
        else
        {
            $company = $this->loadModel('company')->getFirst();
-            if(!$company) $this->app->error(sprintf($this->lang->error->companyNotFound, $httpHost), __FILE__, __LINE__, $exit = true);
+            if(!$company) $this->app->triggerError(sprintf($this->lang->error->companyNotFound, $httpHost), __FILE__, __LINE__, $exit = true);
            $this->session->set('company', $company);
            $this->app->company  = $company;
        }