From f77021b82b51ec2b736fb6e1f235607dbcebbf5d Mon Sep 17 00:00:00 2001 From: Dmitriy Simushev Date: Mon, 18 Feb 2013 13:06:16 +0000 Subject: [PATCH] Use 'chat.thread.id' var instead of 'ct.chatThreadId' in templates --- src/messenger/webim/libs/chat.php | 2 +- src/messenger/webim/mail.php | 2 +- src/messenger/webim/styles/dialogs/default/templates/chat.tpl | 2 +- src/messenger/webim/styles/dialogs/default/templates/mail.tpl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/messenger/webim/libs/chat.php b/src/messenger/webim/libs/chat.php index 0f586e0e..548557ab 100644 --- a/src/messenger/webim/libs/chat.php +++ b/src/messenger/webim/libs/chat.php @@ -294,7 +294,7 @@ function setup_chatview(Thread $thread) { } // Set thread params - $data['ct.chatThreadId'] = $thread->id; + $data['chat.thread.id'] = $thread->id; $data['ct.token'] = $thread->lastToken; $data['chat.title'] = topage( empty($group['vcchattitle']) diff --git a/src/messenger/webim/mail.php b/src/messenger/webim/mail.php index 76977827..64b71c33 100644 --- a/src/messenger/webim/mail.php +++ b/src/messenger/webim/mail.php @@ -44,7 +44,7 @@ if( !$email ) { if( count($errors) > 0 ) { $page['formemail'] = $email; - $page['ct.chatThreadId'] = $thread->id; + $page['chat.thread.id'] = $thread->id; $page['ct.token'] = $thread->lastToken; $page['level'] = ""; $page = array_merge_recursive( diff --git a/src/messenger/webim/styles/dialogs/default/templates/chat.tpl b/src/messenger/webim/styles/dialogs/default/templates/chat.tpl index 913f8313..18400599 100644 --- a/src/messenger/webim/styles/dialogs/default/templates/chat.tpl +++ b/src/messenger/webim/styles/dialogs/default/templates/chat.tpl @@ -74,7 +74,7 @@ isAgent: ${if:agent}true${else:agent}false${endif:agent} }, thread: { - id:${page:ct.chatThreadId}, + id:${page:chat.thread.id}, token:${page:ct.token} }, messageForm: { diff --git a/src/messenger/webim/styles/dialogs/default/templates/mail.tpl b/src/messenger/webim/styles/dialogs/default/templates/mail.tpl index b7196821..8fc674b3 100644 --- a/src/messenger/webim/styles/dialogs/default/templates/mail.tpl +++ b/src/messenger/webim/styles/dialogs/default/templates/mail.tpl @@ -8,7 +8,7 @@
- +