Merge remote-tracking branch 'upstream/master'

Author: marc1706

phpBB/includes/acp/acp_attachments.php

@@ -1079,7 +1079,7 @@ function main($id, $mode)
 				$attachments_per_page = (int) $config['topics_per_page'];
 
 				// Get total number or orphans older than 3 hours
-				$sql = 'SELECT COUNT(attach_id) as num_files, SUM(filesize) as total_size
+				$sql = 'SELECT COUNT(attach_id) as num_files, SUM(' . $this->db->cast_expr_to_bigint('filesize') . ') as total_size
 					FROM ' . ATTACHMENTS_TABLE . '
 					WHERE is_orphan = 1
 						AND filetime < ' . (time() - 3*60*60);

phpBB/includes/acp/acp_forums.php

@@ -2048,7 +2048,7 @@ function delete_forum_content($forum_id)
 
 		$config->set('num_files', (int) $row['stat'], false);
 
-		$sql = 'SELECT SUM(filesize) as stat
+		$sql = 'SELECT SUM(' . $db->cast_expr_to_bigint('filesize') . ') as stat
 			FROM ' . ATTACHMENTS_TABLE;
 		$result = $db->sql_query($sql);
 		$row = $db->sql_fetchrow($result);

phpBB/includes/acp/acp_main.php

@@ -189,7 +189,7 @@ function main($id, $mode)
 						$config->set('num_files', (int) $db->sql_fetchfield('stat'), false);
 						$db->sql_freeresult($result);
 
-						$sql = 'SELECT SUM(filesize) as stat
+						$sql = 'SELECT SUM(' . $db->cast_expr_to_bigint('filesize') . ') as stat
 							FROM ' . ATTACHMENTS_TABLE . '
 							WHERE is_orphan = 0';
 						$result = $db->sql_query($sql);

phpBB/includes/functions_convert.php

@@ -1845,7 +1845,7 @@ function update_dynamic_config()
 	$config->set('num_files', (int) $db->sql_fetchfield('stat'), false);
 	$db->sql_freeresult($result);
 
-	$sql = 'SELECT SUM(filesize) as stat
+	$sql = 'SELECT SUM(' . $db->cast_expr_to_bigint('filesize') . ') as stat
 		FROM ' . ATTACHMENTS_TABLE . '
 		WHERE is_orphan = 0';
 	$result = $db->sql_query($sql);

phpBB/phpbb/db/migration/data/v310/bot_update.php

@@ -17,7 +17,10 @@ class bot_update extends \phpbb\db\migration\migration
 {
 	public static function depends_on()
 	{
-		return array('\phpbb\db\migration\data\v310\rc6');
+		return array(
+			'\phpbb\db\migration\data\v310\rc6',
+			'\phpbb\db\migration\data\v310\avatars',
+		);
 	}
 
 	public function update_data()