From 54106f1d91098953a1cc26c2d8fa2f37cf59e779 Mon Sep 17 00:00:00 2001
From: wangchunsheng <chunsheng@cnezsoft.com>
Date: Tue, 27 Oct 2009 07:36:14 +0000
Subject: [PATCH]  * fix the saveProjectState() error.  + add some error items.

---
 trunk/module/common/control.php    | 5 +++--
 trunk/module/common/lang/zh-cn.php | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/trunk/module/common/control.php b/trunk/module/common/control.php
index c1fc312cf2..249d7086b5 100644
--- a/trunk/module/common/control.php
+++ b/trunk/module/common/control.php
@@ -153,11 +153,12 @@ EOT;
     }
 
     /* 保存最后浏览的项目id到session会话中。*/
-    public static function saveProjectState($projectID, $defaultProjectID)
+    public static function saveProjectState($projectID, $projects)
     {
         global $app;
         if($projectID > 0) $app->session->set('project', (int)$projectID);
-        if($projectID == 0 and $app->session->project == '') $app->session->set('project', $defaultProjectID);
+        if($projectID == 0 and $app->session->project == '') $app->session->set('project', $projects[0]);
+        if(!in_array($app->session->project, $projects)) $app->session->set('project', $projects[0]);
         return $app->session->project;
     }
 
diff --git a/trunk/module/common/lang/zh-cn.php b/trunk/module/common/lang/zh-cn.php
index 08f3fd1358..3979ddc62b 100644
--- a/trunk/module/common/lang/zh-cn.php
+++ b/trunk/module/common/lang/zh-cn.php
@@ -100,7 +100,9 @@ $lang->error->reg             = "銆�%s銆忎笉绗﹀悎鏍煎紡锛屽簲褰撲负:銆�%s銆忋��
 $lang->error->unique          = "銆�%s銆忓凡缁忔湁銆�%s銆忚繖鏉¤褰曚簡銆�";
 $lang->error->notempty        = "銆�%s銆忎笉鑳戒负绌恒��";
 $lang->error->int             = array("銆�%s銆忓簲褰撴槸鏁板瓧銆�", "銆�%s銆忓簲褰撲粙浜庛��%s-%s銆忎箣闂淬��");
+$lang->error->float           = "銆�%s銆忓簲褰撴槸鏁板瓧锛屽彲浠ユ槸灏忔暟銆�";
 $lang->error->email           = "銆�%s銆忓簲褰撲负鍚堟硶鐨凟MAIL銆�";
+$lang->error->date            = "銆�%s銆忓簲褰撲负鍚堟硶鐨勬棩鏈熴��";
 
 /* 鍒嗛〉淇℃伅銆�*/
 $lang->pager->noRecord  = "鏆傛椂娌℃湁璁板綍";