* fix bug.

module/common/view/footer.html.php

@@ -52,7 +52,7 @@ $(function()
                 }
             }
         });
-    }, 60 * 1000);
+    }, 90 * 1000);
 })
 
 <?php if(!empty($this->config->sso->redirect)):?>

module/custom/control.php

@@ -113,6 +113,8 @@ class custom extends control
             }
             else
             {
+                $lang = $_POST['lang'];
+                $oldCustoms = $this->custom->getItems("lang=$lang&module=$module&section=$field");
                 foreach($_POST['keys'] as $index => $key)
                 {
                     if(!empty($key)) $key = trim($key);
@@ -121,7 +123,7 @@ class custom extends control
                     {
                         if(!is_numeric($key) or $key > 255) $this->send(array('result' => 'fail', 'message' => $this->lang->custom->notice->invalidNumberKey));
                     }
-                    if(!empty($key) and $key != 'n/a' and !validater::checkREG($key, '/^[a-z_0-9]+$/')) $this->send(array('result' => 'fail', 'message' => $this->lang->custom->notice->invalidStringKey));
+                    if(!empty($key) and !isset($oldCustoms[$key]) and $key != 'n/a' and !validater::checkREG($key, '/^[a-z_0-9]+$/')) $this->send(array('result' => 'fail', 'message' => $this->lang->custom->notice->invalidStringKey));
 
                     /* The length of roleList in user module and typeList in todo module is less than 10. check it when saved. */
                     if($field == 'roleList' or $module == 'todo' and $field == 'typeList')
@@ -145,7 +147,6 @@ class custom extends control
                     }
                 }
 
-                $lang = $_POST['lang'];
                 $this->custom->deleteItems("lang=$lang&module=$module&section=$field");
                 foreach($_POST['keys'] as $index => $key)
                 {

module/tree/model.php

@@ -1477,6 +1477,7 @@ class treeModel extends model
     public function checkUnique($rootID, $viewType, $parentModuleID, $modules = array(), $branches = array())
     {
         if(empty($branches)) $branches = $this->post->branch;
+        if(empty($branches)) $branches = array(0);
         $branches = array_unique($branches);
 
         if($this->isMergeModule($rootID, $viewType) and $viewType != 'task') $viewType .= ',story';