  					if (!sizeof($error))
  					{
  						$sql_ary = array(
-@@ -633,4 +663,4 @@
+@@ -646,4 +676,4 @@
  	}
  }
  
 -?>
-\ Pas de fin de ligne à la fin du fichier.
+\ No newline at end of file
 +?>
-diff -Naur -x '*schemas*' -x '*language*' -x '*styles*' phpbb3.orig/www/ucp.php phpbb3/www/ucp.php
---- phpbb3.orig/www/ucp.php	2008-07-06 18:32:58.000000000 +0200
-+++ phpbb3/www/ucp.php	2009-01-15 17:07:14.000000000 +0100
+diff -Naur phpbb3.orig/www/ucp.php phpbb3/www/ucp.php
+--- phpbb3.orig/www/ucp.php	2010-03-05 21:37:23.000000000 +0100
++++ phpbb3/www/ucp.php	2010-11-14 20:19:12.000000000 +0100
 @@ -87,12 +87,35 @@
  			$user->session_kill();
  			$user->session_begin();

 
 		$message = $message . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a> ');
 		trigger_error($message);
@@ -335,4 +358,4 @@
 	}
 }
 
-?>
\ Pas de fin de ligne à la fin du fichier.
+?>

diff -Naur phpbb3.orig/www/includes/ucp/ucp_profile.php phpbb3/www/includes/ucp/ucp_profile.php
--- phpbb3.orig/www/includes/ucp/ucp_profile.php	2010-03-05 21:37:22.000000000 +0100
+++ phpbb3/www/includes/ucp/ucp_profile.php	2010-11-14 20:19:12.000000000 +0100
@@ -83,6 +83,7 @@
 						$error[] = 'NEW_PASSWORD_ERROR';
 					}
