4 files changed, 25 insertions, 14 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 865810687b..37c49d7d72 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -381,6 +381,9 @@ class acp_groups
 							$submit_ary['avatar_width'] = 0;
 							$submit_ary['avatar_height'] = 0;
 						}
+
+						// Merge any avatar errors into the primary error array
+						$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
 					}
 
 					// Validate the length of "Maximum number of allowed recipients per private message" setting.
@@ -570,8 +573,11 @@ class acp_groups
 
 				$avatar = phpbb_get_group_avatar($group_row, 'GROUP_AVATAR', true);
 
-				// Merge any avatar errors into the primary error array
-				$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
+				if (!$update)
+				{
+					// Merge any avatar errors into the primary error array
+					$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
+				}
 
 				$back_link = request_var('back_link', '');
 
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index 50d13e00b1..a633ce448c 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -547,6 +547,9 @@ class ucp_groups
 									$submit_ary['avatar_width'] = 0;
 									$submit_ary['avatar_height'] = 0;
 								}
+
+								// Merge any avatars errors into the primary error array
+								$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
 							}
 
 							if (!check_form_key('ucp_groups'))
@@ -672,8 +675,11 @@ class ucp_groups
 							}
 						}
 
-						// Merge any avatars errors into the primary error array
-						$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
+						if (!$update)
+						{
+							// Merge any avatars errors into the primary error array
+							$error = array_merge($error, $phpbb_avatar_manager->localize_errors($user, $avatar_error));
+						}
 
 						$template->assign_vars(array(
 							'S_EDIT'			=> true,
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index ac8861d4a8..ef6b7de418 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -28,7 +28,7 @@ function popup(url, width, height, name) {
 function jumpto() {
 	var page = prompt(jump_page, on_page);
 
-	if (page !== null && !isNaN(page) && page === Math.floor(page) && page > 0) {
+	if (page !== null && !isNaN(page) && page == Math.floor(page) && page > 0) {
 		if (base_url.indexOf('?') === -1) {
 			document.location.href = base_url + '?start=' + ((page - 1) * per_page);
 		} else {
diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html
index f6fcfa043d..4f8e933361 100644
--- a/phpBB/styles/prosilver/template/ucp_groups_manage.html
+++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html
@@ -6,19 +6,18 @@
 
 <div class="panel">
 	<div class="inner">
-	
+
+	<!-- IF S_ERROR -->
+	<fieldset>
+		<p class="error">{ERROR_MSG}</p>
+	</fieldset>
+	<!-- ENDIF -->
+
 	<p>{L_GROUPS_EXPLAIN}</p>
 
 	<!-- IF S_EDIT -->
 		<h3>{L_GROUP_DETAILS}</h3>
-	
-		<!-- IF S_ERROR -->
-		<div class="errorbox">
-			<h3>{L_WARNING}</h3>
-			<p>{ERROR_MSG}</p>
-		</div>
-		<!-- ENDIF -->
-	
+
 		<fieldset>
 		<dl>
 			<dt><label for="group_name">{L_GROUP_NAME}{L_COLON}</label></dt>