3 files changed, 8 insertions, 6 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php
index 05872a907a..e1078822a8 100644
--- a/phpBB/includes/functions_admin.php
+++ b/phpBB/includes/functions_admin.php
@@ -2775,7 +2775,7 @@ function get_database_size()
 
 					$sql = 'SHOW TABLE STATUS
 						FROM ' . $db_name;
-					$result = $db->sql_query($sql);
+					$result = $db->sql_query($sql, 7200);
 
 					$database_size = 0;
 					while ($row = $db->sql_fetchrow($result))
@@ -2825,7 +2825,7 @@ function get_database_size()
 		case 'mssql_odbc':
 			$sql = 'SELECT ((SUM(size) * 8.0) * 1024.0) as dbsize
 				FROM sysfiles';
-			$result = $db->sql_query($sql);
+			$result = $db->sql_query($sql, 7200);
 			$database_size = ($row = $db->sql_fetchrow($result)) ? $row['dbsize'] : false;
 			$db->sql_freeresult($result);
 		break;
@@ -2867,7 +2867,7 @@ function get_database_size()
 		case 'oracle':
 			$sql = 'SELECT SUM(bytes) as dbsize
 				FROM user_segments';
-			$result = $db->sql_query($sql);
+			$result = $db->sql_query($sql, 7200);
 			$database_size = ($row = $db->sql_fetchrow($result)) ? $row['dbsize'] : false;
 			$db->sql_freeresult($result);
 		break;
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 43b2979b17..5476517440 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -365,7 +365,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
 
 	if (!$user->data['user_new_privmsg'])
 	{
-		return 0;
+		return array('not_moved' => 0, 'removed' => 0);
 	}
 
 	$user_message_rules = (int) $user->data['user_message_rules'];
@@ -717,7 +717,7 @@ function place_pm_into_folder(&$global_privmsgs_rules, $release = false)
 	$num_not_moved = (int) $db->sql_fetchfield('num_messages');
 	$db->sql_freeresult($result);
 
-	return array($num_not_moved, $num_removed);
+	return array('not_moved' => $num_not_moved, 'removed' => $num_removed);
 }
 
 /**
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php
index 3d6c287bab..04155e8522 100644
--- a/phpBB/includes/ucp/ucp_pm.php
+++ b/phpBB/includes/ucp/ucp_pm.php
@@ -253,7 +253,9 @@ class ucp_pm
 
 				if ($user->data['user_new_privmsg'] && $action == 'view_folder')
 				{
-					list($num_not_moved, $num_removed) = each(place_pm_into_folder($global_privmsgs_rules, $release));
+					$return = place_pm_into_folder($global_privmsgs_rules, $release);
+					$num_not_moved = $return['not_moved'];
+					$num_removed = $return['removed'];
 				}
 
 				if (!$msg_id && $folder_id == PRIVMSGS_NO_BOX)