From d5a18140b3cdf54c48205ea148afa9205f236c58 Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Mon, 25 Jul 2011 08:37:12 +0000
Subject: [PATCH] r147

 git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@147 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/common.php | 4 ++--
 upload/config.php | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/upload/common.php b/upload/common.php
index 259abe820..8886f4185 100644
--- a/upload/common.php
+++ b/upload/common.php
@@ -1412,7 +1412,7 @@ class datastore_mysql extends datastore_common
 switch ($bb_cfg['datastore_type'])
 {
 	case 'memcache':
-		$datastore = new datastore_memcache($cfg['cache']['memcache']);
+		$datastore = new datastore_memcache($bb_cfg['cache']['memcache']);
 		break;
 
 	case 'sqlite':
@@ -1425,7 +1425,7 @@ switch ($bb_cfg['datastore_type'])
 		break;
 
 	case 'redis':
-		$datastore = new datastore_redis($cfg['cache']['redis']);
+		$datastore = new datastore_redis($bb_cfg['cache']['redis']);
 		break;
 
     case 'eaccelerator':
diff --git a/upload/config.php b/upload/config.php
index 13520f89b..727fce19b 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 r145';
+$bb_cfg['tp_release_state'] = 'TP II r147';
 $bb_cfg['tp_release_date'] = '25-07-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
@@ -77,6 +77,7 @@ $bb_cfg['db_alias'] = array(
 );
 
 // Cache
+$bb_cfg['cache']['pconnect'] = true;
 $bb_cfg['cache']['db_dir']   = realpath(BB_ROOT) .'/cache/filecache/';
 $bb_cfg['cache']['memcache'] = array(
 	'host'         => '127.0.0.1',