diff --git a/upload/attach_mod/displaying_torrent.php b/upload/attach_mod/displaying_torrent.php index 917e58555..73753a5f1 100644 --- a/upload/attach_mod/displaying_torrent.php +++ b/upload/attach_mod/displaying_torrent.php @@ -81,8 +81,8 @@ $description = ($comment) ? $comment : preg_replace("#.torrent$#i", '', $displ if ($tor_auth_reg || $tor_auth_del) { - $reg_tor_url = ''. $lang['BT_REG_ON_TRACKER'] .''; - $unreg_tor_url = ''. $lang['BT_UNREG_FROM_TRACKER'] .''; + $reg_tor_url = ''. $lang['BT_REG_ON_TRACKER'] .''; + $unreg_tor_url = ''. $lang['BT_UNREG_FROM_TRACKER'] .''; $tracker_link = ($tor_reged) ? $unreg_tor_url : $reg_tor_url; } @@ -224,7 +224,7 @@ if ($tor_reged && $tor_info) // torrent status mod 'TOR_STATUS_TEXT' => $lang['tor_status'][$tor_info['tor_status']], 'TOR_STATUS_ICON' => $bb_cfg['tor_icons'][$tor_info['tor_status']], - 'TOR_STATUS_BY' => $cuid ? (' ·  ' . get_username($cuid) . '  ·  '. delta_time($tor_info['checked_time']) .' назад') : '', + 'TOR_STATUS_BY' => ($cuid && $is_auth['auth_mod']) ? (' ·  ' . get_username($cuid) . '  ·  '. delta_time($tor_info['checked_time']) .' назад') : '', 'TOR_STATUS_SELECT' => build_select('', array_flip($bb_cfg['change_tor_status_select']), TOR_APPROVED), //end torrent status mod diff --git a/upload/config.php b/upload/config.php index acb0a2bf0..e051070ce 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,8 +57,8 @@ $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 r49'; -$bb_cfg['tp_release_date'] = '30-06-2011'; +$bb_cfg['tp_release_state'] = 'TP II r56'; +$bb_cfg['tp_release_date'] = '02-07-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут"; diff --git a/upload/includes/page_footer.php b/upload/includes/page_footer.php index 358e91562..99b4fe5de 100644 --- a/upload/includes/page_footer.php +++ b/upload/includes/page_footer.php @@ -62,6 +62,12 @@ if ($show_dbg_info) } $stat .= '  ]'; + $stat .= ' + + + + [ wrap · max ] + '; echo '
'. $stat .'
'; } diff --git a/upload/includes/page_footer_dev.php b/upload/includes/page_footer_dev.php index 22287c1bb..9182d7f99 100644 --- a/upload/includes/page_footer_dev.php +++ b/upload/includes/page_footer_dev.php @@ -92,18 +92,9 @@ if (DEBUG) { '; } -echo ' -
- SQL - - - - [ - wrap · - max - ] -
-'; + +if ($sql_log) +{ echo ' @@ -133,6 +124,7 @@ function fixSqlLog() {
'; +} if (PROFILER && !empty($_COOKIE['prof_enabled'])) { diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php index 628f3df5c..59aaf7b70 100644 --- a/upload/includes/ucp/usercp_register.php +++ b/upload/includes/ucp/usercp_register.php @@ -526,7 +526,7 @@ foreach ($profile_fields as $field => $can_edit) $s_categories .= ''; $s_colspan = 0; - for($i = 0; $i < count($avatar_images[$category]); $i++) + for($i = 0; $i < @count($avatar_images[$category]); $i++) { $template->assign_block_vars("avatar_row", array()); @@ -729,7 +729,7 @@ $template->assign_vars($tp_data); $template->assign_vars(array( 'PAGE_TITLE' => ($mode == 'editprofile') ? $lang['EDIT_PROFILE'] . ($adm_edit ? " :: {$pr_data['username']}" : '') : $lang['REGISTER'], 'SHOW_REG_AGREEMENT' => ($mode == 'register' && !IS_ADMIN), - 'ERROR_MESSAGE' => ($errors) ? join('
', $errors) : '', + 'ERROR_MESSAGE' => ($errors) ? join('
', array_unique($errors)) : '', 'MODE' => $mode, 'EDIT_PROFILE' => ($mode == 'editprofile'), 'ADM_EDIT' => $adm_edit, diff --git a/upload/templates/default/viewtopic_attach.tpl b/upload/templates/default/viewtopic_attach.tpl index 4b8d715c3..e15e0c4a8 100644 --- a/upload/templates/default/viewtopic_attach.tpl +++ b/upload/templates/default/viewtopic_attach.tpl @@ -262,12 +262,11 @@ {L_TOR_STATUS}: - style="padding: 6px 4px;"> + {postrow.attach.tor_reged.TOR_STATUS_ICON} {postrow.attach.tor_reged.TOR_STATUS_TEXT} {postrow.attach.tor_reged.TOR_STATUS_BY} -