From 7ebfc900924faa80875807d39bb726261a33026b Mon Sep 17 00:00:00 2001
From: glix08 <glix08@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Tue, 26 Jul 2011 19:20:35 +0000
Subject: [PATCH] r158
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Исправления незначительных ошибок. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@158 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php             | 2 +-
 upload/includes/functions.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index c148f0fb0..cae2809ce 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,7 +57,7 @@ $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 r156';
+$bb_cfg['tp_release_state'] = 'TP II r158';
 $bb_cfg['tp_release_date'] = '26-07-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
diff --git a/upload/includes/functions.php b/upload/includes/functions.php
index 13eda4958..767152aee 100644
--- a/upload/includes/functions.php
+++ b/upload/includes/functions.php
@@ -1880,7 +1880,7 @@ function message_die ($msg_code, $msg_text = '', $msg_title = '', $err_line = ''
 	{
 		if (!empty($DBS) && $sql_store)
 		{
-			$sql_error = DB()->sql_error();
+			$sql_error = $DBS->sql_error();
 			$debug_text .= "<br /><br />SQL Error : {$sql_error['code']}<br /><br />{$sql_error['message']}";
 		}
 		if ($sql_store)
@@ -1988,7 +1988,7 @@ function phpbb_realpath($path)
 
 function login_redirect ($url = '')
 {
-	redirect('login.php' .'?redirect='. (($url) ? $url : $_SERVER['REQUEST_URI']));
+	redirect('login.php?redirect='. (($url) ? $url : $_SERVER['REQUEST_URI']));
 }
 
 function meta_refresh($url, $time = 5)
@@ -2461,7 +2461,7 @@ function print_page ($args, $type = '', $mode = '')
 
 function caching_output ($enabled, $mode, $cache_var_name, $ttl = 300)
 {
-	if (!$enabled || !CACHE('tr_cache')->used)
+	if (!$enabled || !CACHE('bb_cache')->used)
 	{
 		return;
 	}