From f75d25520ed2433a95b6a4426cb01eca391d6b77 Mon Sep 17 00:00:00 2001
From: pherum83 <pherum83@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Tue, 26 Jul 2011 23:58:18 +0000
Subject: [PATCH] r164

 git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@164 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                                  | 2 +-
 upload/includes/ucp/usercp_attachcp.php            | 5 -----
 upload/language/lang_english/lang_admin_attach.php | 4 ++--
 upload/language/lang_russian/lang_admin_attach.php | 4 ++--
 upload/search.php                                  | 1 -
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index 24eab5555..98040c93f 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1;
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.0.2';
-$bb_cfg['tp_release_state'] = 'TP II r163';
+$bb_cfg['tp_release_state'] = 'TP II r164';
 $bb_cfg['tp_release_date'] = '27-07-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
diff --git a/upload/includes/ucp/usercp_attachcp.php b/upload/includes/ucp/usercp_attachcp.php
index 5b202355a..34a2b7d2f 100644
--- a/upload/includes/ucp/usercp_attachcp.php
+++ b/upload/includes/ucp/usercp_attachcp.php
@@ -172,12 +172,7 @@ $s_hidden .= '<input type="hidden" name="sid" value="' . $userdata['session_id']
 // Assign Template Vars
 $template->assign_vars(array(
 	'PAGE_TITLE' => $lang['USER_ACP_TITLE'],
-	'L_FILENAME' => $lang['FILE_NAME'],
-	'L_FILECOMMENT' => $lang['FILE_COMMENT_CP'],
-	'L_SIZE' => $lang['SIZE_IN_KB'],
-
 	'USERNAME' => $profiledata['username'],
-
 	'S_USER_HIDDEN' => $s_hidden,
 	'S_MODE_ACTION'	=> append_sid(BB_ROOT ."profile.php?mode=attachcp"),
 	'S_MODE_SELECT' => $select_sort_mode,
diff --git a/upload/language/lang_english/lang_admin_attach.php b/upload/language/lang_english/lang_admin_attach.php
index 07495c1d3..f3ea7f880 100644
--- a/upload/language/lang_english/lang_admin_attach.php
+++ b/upload/language/lang_english/lang_admin_attach.php
@@ -171,7 +171,7 @@ $lang['QUOTA_LIMIT_EXIST'] = 'The Quota Limit %s exist already.'; // Replace %s
 // Attachments -> Control Panel
 $lang['CONTROL_PANEL_TITLE'] = 'File Attachment Control Panel';
 $lang['CONTROL_PANEL_EXPLAIN'] = 'Here you can view and manage all attachments based on Users, Attachments, Views etc...';
-$lang['FILE_COMMENT_CP'] = 'File Comment';
+$lang['FILECOMMENT'] = 'File Comment';
 
 // Control Panel -> Search
 $lang['SEARCH_WILDCARD_EXPLAIN'] = 'Use * as a wildcard for partial matches';
@@ -192,7 +192,7 @@ $lang['NUMBER_PMS_ATTACH'] = 'Total Number of Attachments in Private Messages';
 
 // Control Panel -> Attachments
 $lang['STATISTICS_FOR_USER'] = 'Attachment Statistics for %s'; // replace %s with username
-$lang['SIZE_IN_KB'] = 'Size (KB)';
+$lang['SIZE'] = 'Size (KB)';
 $lang['DOWNLOADS'] = 'Downloads';
 $lang['POST_TIME'] = 'Post Time';
 $lang['POSTED_IN_TOPIC'] = 'Posted in Topic';
diff --git a/upload/language/lang_russian/lang_admin_attach.php b/upload/language/lang_russian/lang_admin_attach.php
index d4b8359e2..1cd7bc3cb 100644
--- a/upload/language/lang_russian/lang_admin_attach.php
+++ b/upload/language/lang_russian/lang_admin_attach.php
@@ -174,7 +174,7 @@ $lang['QUOTA_LIMIT_EXIST'] = 'Ограничение %s уже существу
 // Attachments -> Control Panel
 $lang['CONTROL_PANEL_TITLE'] = 'Контрольная панель приложений';
 $lang['CONTROL_PANEL_EXPLAIN'] = 'Здесь Вы можете увидеть и настроить все приложения в зависимости от пользователей, приложений, количества просмотров и т.п.';
-$lang['FILE_COMMENT_CP'] = 'Комментарий к файлу';
+$lang['FILECOMMENT'] = 'Комментарий к файлу';
 
 // Control Panel -> Search
 $lang['SEARCH_WILDCARD_EXPLAIN'] = 'Используйте *, если не знаете точного названия';
@@ -196,7 +196,7 @@ $lang['ATTACHMENTS_PER_DAY'] = 'Прикрепления за день';
 
 // Control Panel -> Attachments
 $lang['STATISTICS_FOR_USER'] = 'Статистика приложений для %s'; // replace %s with username
-$lang['SIZE_IN_KB'] = 'Размер (КБ)';
+$lang['SIZE'] = 'Размер (КБ)';
 $lang['DOWNLOADS'] = 'Скачиваний';
 $lang['POST_TIME'] = 'Дата сообщения';
 $lang['POSTED_IN_TOPIC'] = 'Размещено в теме';
diff --git a/upload/search.php b/upload/search.php
index e12fcb740..ad6f7944b 100644
--- a/upload/search.php
+++ b/upload/search.php
@@ -489,7 +489,6 @@ if ($post_mode)
 		  t.*,
 		  p.*,
 		  h.post_html, IF(h.post_html IS NULL, pt.post_text, NULL) AS post_text,
-		  pt.post_subject,
 		  IF(p.poster_id = $anon_id, p.post_username, u.username) AS username, u.user_id
 		FROM       $posts_tbl
 		INNER JOIN $topics_tbl     ON(t.topic_id = p.topic_id)