From fead1b65a1757db747b99a8775ff02ee2aef1721 Mon Sep 17 00:00:00 2001 From: Dmitriy Simushev Date: Mon, 18 Feb 2013 13:14:05 +0000 Subject: [PATCH] Use 'chat.thread.token' var instead of 'ct.token' 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 548557ab..556d6705 100644 --- a/src/messenger/webim/libs/chat.php +++ b/src/messenger/webim/libs/chat.php @@ -295,7 +295,7 @@ function setup_chatview(Thread $thread) { // Set thread params $data['chat.thread.id'] = $thread->id; - $data['ct.token'] = $thread->lastToken; + $data['chat.thread.token'] = $thread->lastToken; $data['chat.title'] = topage( empty($group['vcchattitle']) ? Settings::get('chattitle') diff --git a/src/messenger/webim/mail.php b/src/messenger/webim/mail.php index 64b71c33..ddbeb8d7 100644 --- a/src/messenger/webim/mail.php +++ b/src/messenger/webim/mail.php @@ -45,7 +45,7 @@ if( !$email ) { if( count($errors) > 0 ) { $page['formemail'] = $email; $page['chat.thread.id'] = $thread->id; - $page['ct.token'] = $thread->lastToken; + $page['chat.thread.token'] = $thread->lastToken; $page['level'] = ""; $page = array_merge_recursive( $page, diff --git a/src/messenger/webim/styles/dialogs/default/templates/chat.tpl b/src/messenger/webim/styles/dialogs/default/templates/chat.tpl index 18400599..ca37be59 100644 --- a/src/messenger/webim/styles/dialogs/default/templates/chat.tpl +++ b/src/messenger/webim/styles/dialogs/default/templates/chat.tpl @@ -75,7 +75,7 @@ }, thread: { id:${page:chat.thread.id}, - token:${page:ct.token} + token:${page:chat.thread.token} }, messageForm: { ${if:agent}${if:canpost} diff --git a/src/messenger/webim/styles/dialogs/default/templates/mail.tpl b/src/messenger/webim/styles/dialogs/default/templates/mail.tpl index 8fc674b3..5be9ff93 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 @@
- +