From a25d5a954df5aac3241ecd69fe83a3b6220c9bd0 Mon Sep 17 00:00:00 2001
From: glix08 <glix08@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Wed, 4 Jul 2012 17:34:34 +0000
Subject: [PATCH] r438
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Отменяем действие r431 за ненадобностью данного кода в целом. Запятая. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@438 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                        | 4 ++--
 upload/includes/functions_admin.php      | 4 ----
 upload/templates/default/page_header.tpl | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index 780f88ffb..feb5d9f71 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 Beta';
-$bb_cfg['tp_release_state'] = 'R437';
-$bb_cfg['tp_release_date'] = '01-07-2012';
+$bb_cfg['tp_release_state'] = 'R438';
+$bb_cfg['tp_release_date'] = '04-07-2012';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/includes/functions_admin.php b/upload/includes/functions_admin.php
index 52760ffec..d5676175c 100644
--- a/upload/includes/functions_admin.php
+++ b/upload/includes/functions_admin.php
@@ -125,11 +125,7 @@ function sync ($type, $id)
 			}
 
 			DB()->query("DROP TEMPORARY TABLE $tmp_sync_topics");
-			
-			// Проверка на остаточные записи об уже удаленных топиках (критично в MySQL 5.5)
-			DB()->query("DELETE FROM ". BB_TOPICS ." WHERE topic_first_post_id NOT IN (SELECT post_id FROM ". BB_POSTS .")");
 
-			
 			break;
 
 		case 'user_posts':
diff --git a/upload/templates/default/page_header.tpl b/upload/templates/default/page_header.tpl
index 52b9590bc..c7786b0d1 100644
--- a/upload/templates/default/page_header.tpl
+++ b/upload/templates/default/page_header.tpl
@@ -312,7 +312,7 @@ if (top != self) {
 	allowed_self = /^(translate\.googleusercontent\.com)$/;
 	if (!self.location.hostname.match(allowed_self)) {
 		$(function(){
-			$('body').html('<center><h1><br /><br />Похоже вас пытаются обмануть<br />Сайт '+ self.location.hostname +' открыт во фрейме</h1></center>');
+			$('body').html('<center><h1><br /><br />Похоже, вас пытаются обмануть<br />Сайт '+ self.location.hostname +' открыт во фрейме</h1></center>');
 		});
 	}
 }