diff --git a/Makefile b/Makefile index 9b8abc72be..a2fe4b3397 100644 --- a/Makefile +++ b/Makefile @@ -55,6 +55,7 @@ pms: cp -r ranzhi/app/sys/chat buildxx/module/ cp -r ranzhi/app/sys/common/ext/model/hook buildxx/module/common/ext/model/ cp -r ranzhi/app/sys/action buildxx/module/ + cp -r xuanxuan/config/* buildxx/config/ cp -r xuanxuan/module/* buildxx/module/ cp -r xuanxuan/www/* buildxx/www/ sed -i 's/site,//' buildxx/module/chat/model.php diff --git a/xuanxuan/module/message/ext/model/class/xuanxuan.class.php b/xuanxuan/module/message/ext/model/class/xuanxuan.class.php index 3fecafbf76..4804d6e314 100644 --- a/xuanxuan/module/message/ext/model/class/xuanxuan.class.php +++ b/xuanxuan/module/message/ext/model/class/xuanxuan.class.php @@ -16,6 +16,7 @@ class xuanxuanMessage extends messageModel $title = $this->app->user->realname . $this->lang->action->label->$actionType . $this->lang->action->objectTypes[$objectType]; $text = $title . ' ' . "[#{$objectID}::{$object->$field}]"; + $onlybody = isset($_GET['onlybody']) ? $_GET['onlybody'] : ''; unset($_GET['onlybody']); $url = common::getSysURL() . helper::createLink($objectType, 'view', "id=$objectID", 'html'); @@ -27,6 +28,7 @@ class xuanxuanMessage extends messageModel $target = array_keys($target); if($target) $this->loadModel('chat')->createNotify($target, $text, '', '', 'text', $url, array(), array('id' => 'zentao', 'realname' => $this->lang->message->sender, 'name' => $this->lang->message->sender)); + if($onlybody) $_GET['onlybody'] = $onlybody; } } }