From ec91bce317b9fa6e2640ae4cd53abd8f74cdf25e Mon Sep 17 00:00:00 2001 From: pherum83 Date: Fri, 30 Sep 2011 17:24:53 +0000 Subject: [PATCH] r294 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Фиксы багов выявленных бета тестерами git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@294 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/ajax/posts.php | 4 ++++ upload/config.php | 14 ++++++++------ upload/includes/cron/jobs/cache_gc.php | 2 +- .../cron/jobs/tr_cleanup_and_dlstat.php | 2 ++ upload/templates/default/index.tpl | 3 +-- upload/templates/default/viewforum.tpl | 17 +++-------------- upload/viewforum.php | 3 ++- 7 files changed, 21 insertions(+), 24 deletions(-) diff --git a/upload/ajax/posts.php b/upload/ajax/posts.php index a2dc80092..d3a126343 100644 --- a/upload/ajax/posts.php +++ b/upload/ajax/posts.php @@ -77,6 +77,10 @@ switch($this->request['type']) $message = (!empty($message)) ? preg_replace($orig_word, $replace_word, $message) : ''; } + if($post['post_attachment'] || $post['topic_first_post_id']) + { + $message = '[quote]'. $post['topic_title'] .'[/quote]'; + } if(mb_strlen($message, 'UTF-8') > 1000) { $this->response['redirect'] = make_url('posting.php?mode=quote&p='. $post_id); diff --git a/upload/config.php b/upload/config.php index 387d62818..7ba64f0df 100644 --- a/upload/config.php +++ b/upload/config.php @@ -53,8 +53,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array(); // Increase number of revision after update $bb_cfg['tp_version'] = '2.1 Stable'; -$bb_cfg['tp_release_state'] = 'R293'; -$bb_cfg['tp_release_date'] = '20-09-2011'; +$bb_cfg['tp_release_state'] = 'R294'; +$bb_cfg['tp_release_date'] = '30-09-2011'; // Database $charset = 'utf8'; @@ -508,7 +508,9 @@ $bb_cfg['copyright_holders_html_path'] = $bb_cfg['html_path'] .'copyright_holder $bb_cfg['advert_html_path'] = $bb_cfg['html_path'] .'advert.html'; # // Captcha -$bb_cfg['captcha']['disabled'] = false; -$bb_cfg['captcha']['secret_key'] = 'secret_key'; -$bb_cfg['captcha']['img_url'] = './images/captcha/'; # without '/' -$bb_cfg['captcha']['img_path'] = BB_PATH .'/images/captcha/'; # without '/' +$bb_cfg['captcha'] = array( + 'disabled' => false, + 'secret_key' => 'secret_key', + 'img_url' => './images/captcha/', # without '/' + 'img_path' => BB_PATH .'/images/captcha/', # without '/' +); diff --git a/upload/includes/cron/jobs/cache_gc.php b/upload/includes/cron/jobs/cache_gc.php index 55737f71a..ecefc7d7a 100644 --- a/upload/includes/cron/jobs/cache_gc.php +++ b/upload/includes/cron/jobs/cache_gc.php @@ -15,6 +15,6 @@ foreach ($gc_cache as $cache_name) if (method_exists(CACHE($cache_name), 'gc')) { $changes = CACHE($cache_name)->gc(); - $cron_runtime_log .= date('Y-m-d H:i:s') ." -- tr -- $changes rows deleted\n"; + $cron_runtime_log = date('Y-m-d H:i:s') ." -- tr -- $changes rows deleted\n"; } } diff --git a/upload/includes/cron/jobs/tr_cleanup_and_dlstat.php b/upload/includes/cron/jobs/tr_cleanup_and_dlstat.php index b0fe5cd20..10b14c140 100644 --- a/upload/includes/cron/jobs/tr_cleanup_and_dlstat.php +++ b/upload/includes/cron/jobs/tr_cleanup_and_dlstat.php @@ -2,6 +2,8 @@ if (!defined('BB_ROOT')) die(basename(__FILE__)); +global $tr_cfg; + $releaser = DL_STATUS_RELEASER; if($bb_cfg['announce_type'] != 'xbt') diff --git a/upload/templates/default/index.tpl b/upload/templates/default/index.tpl index 05b5bc493..f6bdcb3b4 100644 --- a/upload/templates/default/index.tpl +++ b/upload/templates/default/index.tpl @@ -49,8 +49,7 @@ -
{L_HIDE_CAT_MESS}
-
+
{L_HIDE_CAT_MESS}
diff --git a/upload/templates/default/viewforum.tpl b/upload/templates/default/viewforum.tpl index c637ebf76..83d8238bd 100644 --- a/upload/templates/default/viewforum.tpl +++ b/upload/templates/default/viewforum.tpl @@ -382,20 +382,9 @@ td.topic_id { cursor: pointer; } | {L_TOPICS_PER_PAGE}: - {SELECT_TPP} - - {L_STATUS}: - {SELECT_TST} - -   - + +
{SELECT_TPP}
+ diff --git a/upload/viewforum.php b/upload/viewforum.php index 854008b61..917dee513 100644 --- a/upload/viewforum.php +++ b/upload/viewforum.php @@ -440,7 +440,7 @@ $template->assign_vars(array( 'ONLY_NEW_TOPICS_ON' => ($only_new == ONLY_NEW_TOPICS), 'TITLE_MATCH' => htmlCHR($title_match), - 'SELECT_TPP' => ($select_tpp) ? build_select('tpp', $select_tpp, $topics_per_page) : '', + 'SELECT_TPP' => ($select_tpp) ? build_select('tpp', $select_tpp, $topics_per_page, null, null, 'onchange="$(\'#tpp\').submit();"') : '', 'T_POST_NEW_TOPIC' => ($forum_data['forum_status'] == FORUM_LOCKED) ? $lang['FORUM_LOCKED'] : $lang['POST_NEW_TOPIC'], 'S_AUTH_LIST' => $u_auth, 'U_VIEW_FORUM' => FORUM_URL . $forum_id, @@ -572,6 +572,7 @@ else $template->assign_vars(array( 'PAGE_URL' => $pg_url, + 'PAGE_URL_TPP' => url_arg($pg_url, 'tpp', null), 'FOUND_TOPICS' => $found_topics, 'AUTH_MOD' => $is_auth['auth_mod'],