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

* merger

doc/LICENSE

@@ -18,7 +18,7 @@ Z PUBLIC LICENSE 由青岛易软天创网络科技有限公司（www.cnezsoft.co
 电话：  4006-8899-23
 Email： co@cnezsoft.com
 QQ：    1492153927
-地址：  青岛开发区井冈山路东方银座 C座 1106
+地址：  青岛开发区武夷山路167号千禧龙花园 9-1-101室
 
 约定:
 
@@ -121,7 +121,7 @@ Contact: Mr. Xu
 Phone: 4006-8899-23
 Email: co@cnezsoft.com
 QQ:    1492153927
-Address:  Qingdao Development Zone, the Oriental Kenzo C 1106
+Address:  9-1-101, 167 Wuyishan Lu, Kai Fa Qu, Qingdao
 
 We agree: 
 

module/company/css/dynamic.css

@@ -4,4 +4,4 @@
 #featurebar ul.nav > li.active .chosen-container a.chosen-single{font-weight:bold}
 #featurebar ul.nav > li .chosen-container .chosen-drop {min-width: 300px;!important}
 #featurebar .nav > li > .chosen-container-single{top:-1px!important}
-.chosen-container-single .chosen-single div{padding: 6px 22px!important}
+#featurebar .nav > li > .chosen-container-single .chosen-single div{padding: 6px 22px!important}

module/custom/control.php

@@ -87,7 +87,9 @@ class custom extends control
                 {
                     $value  = $_POST['values'][$index];
                     $system = $_POST['systems'][$index];
-                    if(!$system and (!$value or !$key)) continue;
+
+                    //Fix bug #951.
+                    //if(!$system and (!$value or !$key)) continue;
 
                     /* the length of role is 20, check it when save. */
                     if($module == 'user' and $field == 'roleList' and strlen($key) > 20) die(js::alert($this->lang->custom->notice->userRole));