4 files changed, 13 insertions, 8 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 688cb4d20f..cbee63aaf7 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -1323,7 +1323,7 @@ class acp_attachments
 					{
 						$hostlist_tmp[] = "'" . $row['site_hostname'] . "'";
 					}
-					break;
+					// break;
 				}
 				while ($row = $db->sql_fetchrow($result));
 
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index c81081f685..b4ff8ea854 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -966,6 +966,8 @@ class acp_forums
 
 			add_log('admin', 'LOG_FORUM_EDIT', $forum_data['forum_name']);
 		}
+
+		return $errors;
 	}
 
 	/**
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php
index ae178aca83..c62cede3df 100644
--- a/phpBB/includes/acp/acp_jabber.php
+++ b/phpBB/includes/acp/acp_jabber.php
@@ -36,12 +36,13 @@ class acp_jabber
 		$this->tpl_name = 'acp_jabber';
 		$this->page_title = 'ACP_JABBER_SETTINGS';
 
-		$jab_enable		= request_var('jab_enable', $config['jab_enable']);
-		$jab_host		= request_var('jab_host', $config['jab_host']);
-		$jab_port		= request_var('jab_port', $config['jab_port']);
-		$jab_username	= request_var('jab_username', $config['jab_username']);
-		$jab_password	= request_var('jab_password', $config['jab_password']);
-		$jab_resource	= request_var('jab_resource', $config['jab_resource']);
+		$jab_enable			= request_var('jab_enable', $config['jab_enable']);
+		$jab_host			= request_var('jab_host', $config['jab_host']);
+		$jab_port			= request_var('jab_port', $config['jab_port']);
+		$jab_username		= request_var('jab_username', $config['jab_username']);
+		$jab_password		= request_var('jab_password', $config['jab_password']);
+		$jab_resource		= request_var('jab_resource', $config['jab_resource']);
+		$jab_package_size	= request_var('jab_package_size', $config['jab_package_size']);
 
 		$jabber = new jabber();
 		$error = array();
@@ -160,7 +161,8 @@ class acp_jabber
 			'JAB_PORT'				=> $new['jab_port'],
 			'JAB_USERNAME'			=> $new['jab_username'],
 			'JAB_PASSWORD'			=> $new['jab_password'],
-			'JAB_RESOURCE'			=> $new['jab_resource'])
+			'JAB_RESOURCE'			=> $new['jab_resource'],
+			'JAB_PACKAGE_SIZE'		=> $new['jab_package_size'])
 		);		
 	}
 }
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 1a079b8e0d..63e5401203 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -621,6 +621,7 @@ class acp_users
 					{
 						$error[] = 'NEW_EMAIL_ERROR';
 					}
+					$error[] = 'NEW_EMAIL_ERROR';
 
 					// Which updates do we need to do?
 					$update_warning = ($user_row['user_warnings'] != $data['warnings']) ? true : false;