From 32e5b45a81b40c9c2b32ae55559b0da563f19f3c Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Tue, 4 Dec 2012 18:25:40 +0000
Subject: [PATCH] r480
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

не выводить топики в новостях если тема уже перенесена git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@480 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                              | 4 ++--
 upload/includes/datastore/build_cat_forums.php | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index 29ffbe551..30d89131b 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 pre-stable';
-$bb_cfg['tp_release_date'] = '28-11-2012';
-$bb_cfg['tp_release_state'] = 'R478';
+$bb_cfg['tp_release_date'] = '5-12-2012';
+$bb_cfg['tp_release_state'] = 'R480';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/includes/datastore/build_cat_forums.php b/upload/includes/datastore/build_cat_forums.php
index 997fb6c87..3ca07396d 100644
--- a/upload/includes/datastore/build_cat_forums.php
+++ b/upload/includes/datastore/build_cat_forums.php
@@ -136,6 +136,7 @@ if ($bb_cfg['show_latest_news'] AND $news_forum_ids = $bb_cfg['latest_news_forum
 		SELECT topic_id, topic_time, topic_title, forum_id
 		FROM ". BB_TOPICS ."
 		WHERE forum_id IN ($news_forum_ids)
+	      AND topic_moved_id = 0
 		ORDER BY topic_time DESC
 		LIMIT $news_count
 	");
@@ -154,6 +155,7 @@ if ($bb_cfg['show_network_news'] AND $net_forum_ids = $bb_cfg['network_news_foru
       SELECT topic_id, topic_time, topic_title, forum_id
       FROM ". BB_TOPICS ."
       WHERE forum_id IN ($net_forum_ids)
+	      AND topic_moved_id = 0
       ORDER BY topic_time DESC
       LIMIT $net_count
    ");