From 780b07bb636a7b797531793333be296bf3ca2a53 Mon Sep 17 00:00:00 2001
From: Mzhelskiy Maxim <rus.engine@gmail.com>
Date: Mon, 21 Jan 2013 10:55:29 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7?=
 =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B8=D0=BD=D0=B1=D0=BE=D0=BA=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/modules/talk/Talk.class.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/classes/modules/talk/Talk.class.php b/classes/modules/talk/Talk.class.php
index 896b7367..8d2c4331 100644
--- a/classes/modules/talk/Talk.class.php
+++ b/classes/modules/talk/Talk.class.php
@@ -587,7 +587,10 @@ class ModuleTalk extends Module {
 	 * @param  int $sTalkId	ID разговора
 	 * @return array
 	 */
-	public function GetTalkUsersByTalkId($sTalkId) {
+	public function GetTalkUsersByTalkId($sTalkId,$aAllowData=null) {
+		if (is_null($aAllowData)) {
+			$aAllowData=array('user'=>array());
+		}
 		if (false === ($aTalkUsers = $this->Cache_Get("talk_relation_user_by_talk_id_{$sTalkId}"))) {
 			$aTalkUsers = $this->oMapper->GetTalkUsers($sTalkId);
 			$this->Cache_Set($aTalkUsers, "talk_relation_user_by_talk_id_{$sTalkId}", array("update_talk_user_{$sTalkId}"), 60*60*24*1);
@@ -598,7 +601,7 @@ class ModuleTalk extends Module {
 			foreach ($aTalkUsers as $oTalkUser) {
 				$aUserId[]=$oTalkUser->getUserId();
 			}
-			$aUsers = $this->User_GetUsersAdditionalData($aUserId);
+			$aUsers = $this->User_GetUsersAdditionalData($aUserId,isset($aAllowData['user']) && is_array($aAllowData['user']) ? $aAllowData['user'] : null);
 
 			foreach ($aTalkUsers as $oTalkUser){
 				if(isset($aUsers[$oTalkUser->getUserId()])) {