diff --git a/classes/actions/ActionProfile.class.php b/classes/actions/ActionProfile.class.php index 86dc991d..97b81e75 100644 --- a/classes/actions/ActionProfile.class.php +++ b/classes/actions/ActionProfile.class.php @@ -441,7 +441,11 @@ class ActionProfile extends Action { 'user_text'=>$sUserText ) ); - $this->Talk_SendTalk($sTitle,$sText,$this->oUserCurrent,array($oUser),false,false); + $oTalk=$this->Talk_SendTalk($sTitle,$sText,$this->oUserCurrent,array($oUser),false,false); + /** + * Удаляем отправляющего юзера из переписки + */ + $this->Talk_DeleteTalkUserByArray($oTalk->getId(),$this->oUserCurrent->getId()); } else { $this->Message_AddErrorSingle($this->Lang_Get('system_error'),$this->Lang_Get('error')); } diff --git a/classes/actions/ActionTalk.class.php b/classes/actions/ActionTalk.class.php index 7e0dbd4e..450a7cf0 100644 --- a/classes/actions/ActionTalk.class.php +++ b/classes/actions/ActionTalk.class.php @@ -316,6 +316,24 @@ class ActionTalk extends Action { $this->Viewer_Assign('aComments',$aComments); $this->Viewer_Assign('iMaxIdComment',$iMaxIdComment); $this->Viewer_AddBlocks('right',array('actions/ActionTalk/speakers.tpl')); + /** + * Подсчитываем нужно ли отображать комментарии. + * Комментарии не отображаются, если у вестки только один читатель + * и ранее созданных комментариев нет. + */ + if(count($aComments)==0) { + $iActiveSpeakers=0; + foreach((array)$oTalk->getTalkUsers() as $oTalkUser) { + if( ($oTalkUser->getUserId()!=$this->oUserCurrent->getId()) + && $oTalkUser->getUserActive()==LsTalk::TALK_USER_ACTIVE ){ + $iActiveSpeakers++; + break; + } + } + if($iActiveSpeakers==0) { + $this->Viewer_Assign('bNoComments',true); + } + } } diff --git a/classes/modules/user/User.class.php b/classes/modules/user/User.class.php index a8e3ed52..d9fb37a1 100644 --- a/classes/modules/user/User.class.php +++ b/classes/modules/user/User.class.php @@ -823,8 +823,6 @@ class LsUser extends Module { return $data; } - - /** * Получает инвайт по его коду * diff --git a/templates/skin/new/actions/ActionTalk/read.tpl b/templates/skin/new/actions/ActionTalk/read.tpl index e778508c..fbe67bf5 100644 --- a/templates/skin/new/actions/ActionTalk/read.tpl +++ b/templates/skin/new/actions/ActionTalk/read.tpl @@ -20,6 +20,7 @@ {assign var="oTalkUser" value=$oTalk->getTalkUser()} + {if !$bNoComments} {include file='comment_tree.tpl' iTargetId=$oTalk->getId() @@ -29,6 +30,7 @@ sNoticeCommentAdd=$aLang.topic_comment_add bNoCommentFavourites=true } + {/if} {include file='footer.tpl'} \ No newline at end of file