From 069745da608c117479bf515dcd803f03e2cff96d Mon Sep 17 00:00:00 2001
From: Exile <iglix@me.com>
Date: Fri, 29 Aug 2014 15:55:35 +0400
Subject: [PATCH] Some fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Исправления обнаруженных ошибок.
---
 upload/language/en/main.php            |  2 +-
 upload/language/ru/main.php            |  2 +-
 upload/language/uk/main.php            |  2 +-
 upload/templates/default/viewtopic.tpl |  2 +-
 upload/tracker.php                     |  2 +-
 upload/viewtopic.php                   | 11 ++++++-----
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/upload/language/en/main.php b/upload/language/en/main.php
index 477f69142..c5dcb38d8 100644
--- a/upload/language/en/main.php
+++ b/upload/language/en/main.php
@@ -785,7 +785,7 @@ $lang['MEMBERS_IN_GROUP'] = 'Members in group';
 
 // Release Groups
 $lang['POST_RELEASE_FROM_GROUP'] = 'Post release from group';
-$lang['CHOOSE_RELEASE_GROUP'] = 'Select release group';
+$lang['CHOOSE_RELEASE_GROUP'] = 'not selected';
 $lang['ATTACH_RG_SIG'] = 'attach release group signature';
 $lang['RELEASE_FROM_RG'] = 'Release was prepared by';
 $lang['GROUPS_RELEASES'] = 'Group\'s releases';
diff --git a/upload/language/ru/main.php b/upload/language/ru/main.php
index 466beb2a5..ab8ca48f9 100644
--- a/upload/language/ru/main.php
+++ b/upload/language/ru/main.php
@@ -785,7 +785,7 @@ $lang['MEMBERS_IN_GROUP'] = 'Кол-во участников';
 
 // Release Groups
 $lang['POST_RELEASE_FROM_GROUP'] = 'Создать релиз от группы';
-$lang['CHOOSE_RELEASE_GROUP'] = 'Выбрать релиз группу';
+$lang['CHOOSE_RELEASE_GROUP'] = 'не выбрано';
 $lang['ATTACH_RG_SIG'] = 'добавить подпись релиз группы';
 $lang['RELEASE_FROM_RG'] = 'Релиз подготовлен';
 $lang['GROUPS_RELEASES'] = 'Релизы группы';
diff --git a/upload/language/uk/main.php b/upload/language/uk/main.php
index 911c3bcc8..f8d98815c 100644
--- a/upload/language/uk/main.php
+++ b/upload/language/uk/main.php
@@ -785,7 +785,7 @@ $lang['MEMBERS_IN_GROUP'] = 'Кількість учасників';
 
 // Release Groups
 $lang['POST_RELEASE_FROM_GROUP'] = 'Створити реліз від групи';
-$lang['CHOOSE_RELEASE_GROUP'] = 'Вибрати реліз групи';
+$lang['CHOOSE_RELEASE_GROUP'] = 'не вибрано';
 $lang['ATTACH_RG_SIG'] = 'додати підпис реліз групи';
 $lang['RELEASE_FROM_RG'] = 'Реліз підготовлений';
 $lang['GROUPS_RELEASES'] = 'Релізи групи';
diff --git a/upload/templates/default/viewtopic.tpl b/upload/templates/default/viewtopic.tpl
index 968129656..fa8cf0fb2 100644
--- a/upload/templates/default/viewtopic.tpl
+++ b/upload/templates/default/viewtopic.tpl
@@ -410,7 +410,7 @@ function build_poll_add_form (src_el)
 					<h4 class="alert-heading">{L_RELEASE_FROM_RG} <a href="{postrow.RG_URL}">{postrow.RG_NAME}</a></h4>
 					<div id="pg_info_{postrow.POST_ID}">
 						<!-- IF postrow.RG_AVATAR --><hr /><a href="{postrow.RG_URL}">{postrow.RG_AVATAR}</a><!-- ENDIF -->
-						<!-- IF postrow.RG_SIG --><hr /><div id="rg_sig">{postrow.RG_SIG}</div><!-- ENDIF -->
+						<!-- IF postrow.RG_SIG and postrow.RG_SIG_ATTACH --><hr /><div id="rg_sig">{postrow.RG_SIG}</div><!-- ENDIF -->
 						<hr /><a href="{postrow.RG_FIND_URL}">{L_MORE_RELEASES}</a>
 					</div>
 				</div>
diff --git a/upload/tracker.php b/upload/tracker.php
index 90b3114da..d5b9378b5 100644
--- a/upload/tracker.php
+++ b/upload/tracker.php
@@ -225,7 +225,7 @@ if ($release_groups = get_group_data('all'))
 {
 	$s_rg_opt = array(
 		$search_all => array(
-			'lang' => $lang['GROUPS_RELEASES'],
+			'lang' => $lang['CHOOSE_RELEASE_GROUP'],
 			'sql'  => 0,
 	));
 	foreach ($release_groups as $rg)
diff --git a/upload/viewtopic.php b/upload/viewtopic.php
index 20dae9cf7..09da20650 100644
--- a/upload/viewtopic.php
+++ b/upload/viewtopic.php
@@ -885,6 +885,7 @@ for($i = 0; $i < $total_posts; $i++)
 		'RG_URL'             => GROUP_URL . $rg_id,
 		'RG_FIND_URL'        => 'tracker.php?srg='. $rg_id,
 		'RG_SIG'             => $rg_signature,
+		'RG_SIG_ATTACH'      => $postrow[$i]['attach_rg_sig'],
 	));
 
 	if ($postrow[$i]['post_attachment'] && $is_auth['auth_download'] && function_exists('display_post_attachments'))
@@ -922,10 +923,10 @@ if ($bb_cfg['show_quick_reply'])
 	if ($is_auth['auth_reply'] && !($t_data['forum_status'] == FORUM_LOCKED || $t_data['topic_status'] == TOPIC_LOCKED))
 	{
 		$template->assign_vars(array(
-			'QUICK_REPLY'     => true,
-			'QR_POST_ACTION'  => POSTING_URL,
-			'QR_TOPIC_ID'     => $topic_id,
-			'CAPTCHA_HTML'    => (IS_GUEST) ? CAPTCHA()->get_html() : '',
+			'QUICK_REPLY'    => true,
+			'QR_POST_ACTION' => POSTING_URL,
+			'QR_TOPIC_ID'    => $topic_id,
+			'CAPTCHA_HTML'   => (IS_GUEST) ? CAPTCHA()->get_html() : '',
 		));
 
 		if (!IS_GUEST)
@@ -933,7 +934,7 @@ if ($bb_cfg['show_quick_reply'])
 			$notify_user = bf($userdata['user_opt'], 'user_opt', 'user_notify');
 
 			$template->assign_vars(array(
-				'QR_NOTIFY_CHECKED'    => ($notify_user) ? $notify_user && $is_watching_topic : $is_watching_topic,
+				'QR_NOTIFY_CHECKED' => ($notify_user) ? $notify_user && $is_watching_topic : $is_watching_topic,
 			));
 		}
 	}