diff --git a/upload/config.php b/upload/config.php
index fddf71812..abdc8048d 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,8 +57,8 @@ $bb_cfg['css_ver'] = 1;
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.1 Beta';
-$bb_cfg['tp_release_state'] = 'R209';
-$bb_cfg['tp_release_date'] = '14-08-2011';
+$bb_cfg['tp_release_state'] = 'R212';
+$bb_cfg['tp_release_date'] = '16-08-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
 $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут";
diff --git a/upload/includes/datastore/build_cat_forums.php b/upload/includes/datastore/build_cat_forums.php
index 74c903bb4..a3a934bd8 100644
--- a/upload/includes/datastore/build_cat_forums.php
+++ b/upload/includes/datastore/build_cat_forums.php
@@ -73,6 +73,8 @@ foreach (DB()->fetch_rowset($sql) as $row)
 		$not_auth['user_read'][] = $fid;
 	}
 
+    $data['forum'][$fid] = $row;
+
 	// Store forums data
 	if ($parent_id = $row['forum_parent'])
 	{
diff --git a/upload/viewforum.php b/upload/viewforum.php
index 1e7758ec3..bd79d178b 100644
--- a/upload/viewforum.php
+++ b/upload/viewforum.php
@@ -40,10 +40,12 @@ $req_page .= ($start) ? "_start{$start}" : '';
 define('REQUESTED_PAGE', $req_page);
 caching_output(IS_GUEST, 'send', REQUESTED_PAGE .'_guest');
 
-// Check if the user has actually sent a forum ID
-$sql = "SELECT * FROM ". BB_FORUMS ." WHERE forum_id = $forum_id LIMIT 1";
-
-if (!$forum_id OR !$forum_data = DB()->fetch_row($sql))
+if (!$forums = $datastore->get('cat_forums'))
+{
+	$datastore->update('cat_forums');
+	$forums = $datastore->get('cat_forums');
+}
+if (!$forum_id OR !$forum_data = @$forums['forum'][$forum_id])
 {
 	bb_die($lang['FORUM_NOT_EXIST']);
 }