From faa09bf5e28e2a053ef5dedcc7851d9bec516151 Mon Sep 17 00:00:00 2001
From: pherum83 <pherum83@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Wed, 12 Oct 2011 18:24:53 +0000
Subject: [PATCH] r299

 git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@299 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                                 | 4 ++--
 upload/includes/cron/jobs/bb_manage_untrusted.php | 3 ---
 upload/includes/init_bb.php                       | 2 +-
 upload/language/lang_russian/lang_main.php        | 1 -
 upload/report.php                                 | 2 +-
 5 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 upload/includes/cron/jobs/bb_manage_untrusted.php

diff --git a/upload/config.php b/upload/config.php
index 9d094fdf4..38ff755cf 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'] = 'R298';
-$bb_cfg['tp_release_date'] = '02-10-2011';
+$bb_cfg['tp_release_state'] = 'R299';
+$bb_cfg['tp_release_date'] = '12-10-2011';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/includes/cron/jobs/bb_manage_untrusted.php b/upload/includes/cron/jobs/bb_manage_untrusted.php
deleted file mode 100644
index 98d16e7e2..000000000
--- a/upload/includes/cron/jobs/bb_manage_untrusted.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-if (!defined('BB_ROOT')) die(basename(__FILE__));
diff --git a/upload/includes/init_bb.php b/upload/includes/init_bb.php
index c0a830f36..c166b5d88 100644
--- a/upload/includes/init_bb.php
+++ b/upload/includes/init_bb.php
@@ -547,7 +547,7 @@ $datastore->enqueue(array(
 if(!$bb_cfg['board_startdate'])
 {
     bb_update_config(array('board_startdate' => TIMENOW));
-	DB()->query("UPDATE ". BB_USERS ." SET user_regdate = ". TIMENOW ." WHERE user_id IN(2, ". EXCLUDED_USERS_CSV);
+	DB()->query("UPDATE ". BB_USERS ." SET user_regdate = ". TIMENOW ." WHERE user_id IN(2, ". EXCLUDED_USERS_CSV .")");
 }
 
 // Cron
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index 25dc3c037..acb358918 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -5,7 +5,6 @@
 // borz_off@cs.msu.su
 //
 
-setlocale(LC_ALL, 'ru_RU.UTF-8');
 $lang['CONTENT_ENCODING'] = 'UTF-8';
 $lang['CONTENT_DIRECTION'] = 'ltr';
 $lang['DATE_FORMAT'] = 'Y-m-d'; //'d.m.Y'; // This should be changed to the default date format for your language, php date() format
diff --git a/upload/report.php b/upload/report.php
index ab3390733..683e34380 100644
--- a/upload/report.php
+++ b/upload/report.php
@@ -585,7 +585,7 @@ else
 							foreach ($report_subject['details'] as $detail_title => $detail_value)
 							{
 								$template->assign_block_vars('report_subject.details', array(
-									'TITLE' => $report_module->lang[$detail_title],
+									'TITLE' => $report_module->lang[strtoupper($detail_title)],
 									'VALUE' => $detail_value)
 								);
 							}