From fe2343965bf88a3e695bb93e7d45da8d9261ccf2 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Mon, 9 Jun 2008 11:59:43 +0000
Subject: [PATCH] merge

git-svn-id: file:///svn/phpbb/trunk@8629 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/acp/acp_icons.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php
index e9b24155c8..e6ea124ae5 100644
--- a/phpBB/includes/acp/acp_icons.php
+++ b/phpBB/includes/acp/acp_icons.php
@@ -435,7 +435,7 @@ class acp_icons
 					default:
 						$suc_lang = $lang;
 				}
-				$errormsgs = '<br />';
+				$errormsgs = '';
 				foreach ($errors as $img => $error)
 				{
 					$errormsgs .= '<br />' . sprintf($user->lang[$error], $img);
@@ -446,7 +446,7 @@ class acp_icons
 				}
 				else
 				{
-					trigger_error($user->lang[$suc_lang . '_ADDED'] . $errormsgs .adm_back_link($this->u_action), $level);
+					trigger_error($user->lang[$suc_lang . '_ADDED'] . $errormsgs . adm_back_link($this->u_action), $level);
 				}
 
 			break;