From 779a8c63214a27b78e0c3de88fa506dbc7bba366 Mon Sep 17 00:00:00 2001
From: pherum83 <pherum83@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Sat, 5 May 2012 00:45:48 +0000
Subject: [PATCH] r411
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

фикс общего сброса git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@411 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/common.php                         | 18 +++++++++---------
 upload/config.php                         |  2 +-
 upload/includes/datastore/build_stats.php |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/upload/common.php b/upload/common.php
index b23a4b848..ce6f2cc77 100644
--- a/upload/common.php
+++ b/upload/common.php
@@ -264,7 +264,7 @@ class cache_common
 	/**
 	* Remove variable
 	*/
-	function rm ($name, $prefix = '')
+	function rm ($name = '', $prefix = '')
 	{
 		return false;
 	}
@@ -393,7 +393,7 @@ class cache_memcache extends cache_common
 		return ($this->connected) ? $this->memcache->set($name, $value, false, $ttl) : false;
 	}
 
-	function rm ($name, $prefix = '')
+	function rm ($name = '', $prefix = '')
 	{
 		if (!$this->connected) $this->connect();
 
@@ -496,7 +496,7 @@ class cache_sqlite extends cache_common
 		return (bool) $result;
 	}
 
-	function rm ($name, $prefix = '')
+	function rm ($name = '', $prefix = '')
 	{
 		if($name)
 		{
@@ -663,7 +663,7 @@ class sqlite_common extends cache_common
 		return 'SQLite error #'. ($err_code = sqlite_last_error($this->dbh)) .': '. sqlite_error_string($err_code);
 	}
 
-    function rm ($name, $prefix = '')
+    function rm ($name = '', $prefix = '')
 	{
 		if($name)
 		{
@@ -767,7 +767,7 @@ class cache_redis extends cache_common
 		}
 	}
 
-	function rm ($name, $prefix = '')
+	function rm ($name = '', $prefix = '')
 	{
 		if (!$this->connected) $this->connect();
 
@@ -822,7 +822,7 @@ class cache_eaccelerator extends cache_common
 		return eaccelerator_put($name, $value, $ttl);
 	}
 
-	function rm ($name, $prefix = '')
+	function rm ($name = '', $prefix = '')
 	{
 		$this->cur_query = "cache->rm('$name')";
 		$this->debug('start');
@@ -875,7 +875,7 @@ class cache_apc extends cache_common
 		return apc_store($name, $value, $ttl);
 	}
 
-	function rm ($name, $prefix = '')
+	function rm ($name = '', $prefix = '')
 	{
 		$this->cur_query = "cache->rm('$name')";
 		$this->debug('start');
@@ -928,7 +928,7 @@ class cache_xcache extends cache_common
 		return xcache_set($name, $value, $ttl);
 	}
 
-	function rm ($name, $prefix = '')
+	function rm ($name = '', $prefix = '')
 	{
 		$this->cur_query = "cache->rm('$name')";
 		$this->debug('start');
@@ -1004,7 +1004,7 @@ class cache_file extends cache_common
 		return (bool) file_write($filecache, $filename, false, true, true);
 	}
 
-	function rm ($name, $prefix = '')
+	function rm ($name = '', $prefix = '')
 	{
 		$clear = false;
 		if($name)
diff --git a/upload/config.php b/upload/config.php
index 8aab13050..004b809a2 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -52,7 +52,7 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 Beta';
-$bb_cfg['tp_release_state'] = 'R410';
+$bb_cfg['tp_release_state'] = 'R411';
 $bb_cfg['tp_release_date'] = '05-05-2012';
 
 // Database
diff --git a/upload/includes/datastore/build_stats.php b/upload/includes/datastore/build_stats.php
index 141ba882e..8e172cea1 100644
--- a/upload/includes/datastore/build_stats.php
+++ b/upload/includes/datastore/build_stats.php
@@ -11,7 +11,7 @@ $row = DB()->fetch_row("SELECT COUNT(*) AS usercount FROM ". BB_USERS ." WHERE u
 $data['usercount'] = number_format($row['usercount']);
 
 // newestuser
-$row = DB()->fetch_row("SELECT user_id, username, user_rank FROM ". BB_USERS ." ORDER BY user_id DESC LIMIT 1");
+$row = DB()->fetch_row("SELECT user_id, username, user_rank FROM ". BB_USERS ." WHERE user_active = 1 ORDER BY user_id DESC LIMIT 1");
 $data['newestuser'] = $row;
 
 // post/topic count