github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 14:23:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r164

Browse source 
git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@164 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
pherum83 2011-07-26 23:58:18 +00:00
commit f75d25520e
5 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
upload/config.php
View file

@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1;
// Increase number of revision after update // Increase number of revision after update
$bb_cfg['tp_version'] = '2.0.2'; $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['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 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger

5
upload/includes/ucp/usercp_attachcp.php
View file

@ -172,12 +172,7 @@ $s_hidden .= '<input type="hidden" name="sid" value="' . $userdata['session_id']
// Assign Template Vars // Assign Template Vars
$template->assign_vars(array( $template->assign_vars(array(
'PAGE_TITLE' => $lang['USER_ACP_TITLE'], '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'], 'USERNAME' => $profiledata['username'],
'S_USER_HIDDEN' => $s_hidden, 'S_USER_HIDDEN' => $s_hidden,
'S_MODE_ACTION' => append_sid(BB_ROOT ."profile.php?mode=attachcp"), 'S_MODE_ACTION' => append_sid(BB_ROOT ."profile.php?mode=attachcp"),
'S_MODE_SELECT' => $select_sort_mode, 'S_MODE_SELECT' => $select_sort_mode,

4
upload/language/lang_english/lang_admin_attach.php
View file

@ -171,7 +171,7 @@ $lang['QUOTA_LIMIT_EXIST'] = 'The Quota Limit %s exist already.'; // Replace %s
// Attachments -> Control Panel // Attachments -> Control Panel
$lang['CONTROL_PANEL_TITLE'] = 'File Attachment 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['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 // Control Panel -> Search
$lang['SEARCH_WILDCARD_EXPLAIN'] = 'Use * as a wildcard for partial matches'; $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 // Control Panel -> Attachments
$lang['STATISTICS_FOR_USER'] = 'Attachment Statistics for %s'; // replace %s with username $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['DOWNLOADS'] = 'Downloads';
$lang['POST_TIME'] = 'Post Time'; $lang['POST_TIME'] = 'Post Time';
$lang['POSTED_IN_TOPIC'] = 'Posted in Topic'; $lang['POSTED_IN_TOPIC'] = 'Posted in Topic';

4
upload/language/lang_russian/lang_admin_attach.php
View file

@ -174,7 +174,7 @@ $lang['QUOTA_LIMIT_EXIST'] = 'Ограничение %s уже существу
// Attachments -> Control Panel // Attachments -> Control Panel
$lang['CONTROL_PANEL_TITLE'] = 'Контрольная панель приложений'; $lang['CONTROL_PANEL_TITLE'] = 'Контрольная панель приложений';
$lang['CONTROL_PANEL_EXPLAIN'] = 'Здесь Вы можете увидеть и настроить все приложения в зависимости от пользователей, приложений, количества просмотров и т.п.'; $lang['CONTROL_PANEL_EXPLAIN'] = 'Здесь Вы можете увидеть и настроить все приложения в зависимости от пользователей, приложений, количества просмотров и т.п.';
$lang['FILE_COMMENT_CP'] = 'Комментарий к файлу'; $lang['FILECOMMENT'] = 'Комментарий к файлу';
// Control Panel -> Search // Control Panel -> Search
$lang['SEARCH_WILDCARD_EXPLAIN'] = 'Используйте *, если не знаете точного названия'; $lang['SEARCH_WILDCARD_EXPLAIN'] = 'Используйте *, если не знаете точного названия';
@ -196,7 +196,7 @@ $lang['ATTACHMENTS_PER_DAY'] = 'Прикрепления за день';
// Control Panel -> Attachments // Control Panel -> Attachments
$lang['STATISTICS_FOR_USER'] = 'Статистика приложений для %s'; // replace %s with username $lang['STATISTICS_FOR_USER'] = 'Статистика приложений для %s'; // replace %s with username
$lang['SIZE_IN_KB'] = 'Размер (КБ)'; $lang['SIZE'] = 'Размер (КБ)';
$lang['DOWNLOADS'] = 'Скачиваний'; $lang['DOWNLOADS'] = 'Скачиваний';
$lang['POST_TIME'] = 'Дата сообщения'; $lang['POST_TIME'] = 'Дата сообщения';
$lang['POSTED_IN_TOPIC'] = 'Размещено в теме'; $lang['POSTED_IN_TOPIC'] = 'Размещено в теме';

1
upload/search.php
View file

@ -489,7 +489,6 @@ if ($post_mode)
t.*, t.*,
p.*, p.*,
h.post_html, IF(h.post_html IS NULL, pt.post_text, NULL) AS post_text, 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 IF(p.poster_id = $anon_id, p.post_username, u.username) AS username, u.user_id
FROM $posts_tbl FROM $posts_tbl
INNER JOIN $topics_tbl ON(t.topic_id = p.topic_id) INNER JOIN $topics_tbl ON(t.topic_id = p.topic_id)