diff --git a/framework/control.class.php b/framework/control.class.php index 3554707ffd..3ee876480c 100644 --- a/framework/control.class.php +++ b/framework/control.class.php @@ -341,7 +341,9 @@ class control extends baseControl $message = array(); foreach($fields as $field) { - if($field->buildin or !$field->show or !isset($layouts[$field->field])) continue; + if(!empty($field->buildin)) continue; + if(empty($field->show)) continue; + if(!isset($layouts[$field->field])) continue; $fieldRules = explode(',', trim($field->rules, ',')); $fieldRules = array_unique($fieldRules); diff --git a/module/common/model.php b/module/common/model.php index 711d0d8657..0fee18a258 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -119,6 +119,7 @@ class commonModel extends model $user->id = 0; $user->account = 'guest'; $user->realname = 'guest'; + $user->dept = 0; $user->avatar = ''; $user->role = 'guest'; $user->admin = false; diff --git a/module/story/control.php b/module/story/control.php index 8d531ad5b2..faed21ea14 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -1864,6 +1864,7 @@ class story extends control public function ajaxGetInfo($storyID) { $story = $this->story->getByID($storyID); + if(empty($story)) return; $storyInfo['moduleID'] = $story->module; $storyInfo['estimate'] = $story->estimate;