Merge lp:~guiona/bilboplanet/719208 into lp:~greg-theclimber/bilboplanet/testing

[Gregoire de Hemptinne]

=== modified file 'admin/api/manage-user_api.php' (properties changed: -x to +x)
--- admin/api/manage-user_api.php	2010-12-21 14:18:06 +0000
+++ admin/api/manage-user_api.php	2011-03-07 12:46:14 +0000
@@ -34,7 +34,7 @@
 		$rs = $core->con->select("SELECT * FROM ".$core->prefix."user WHERE user_id = '$user_id'");
 		$user = array(
 			"user_id" => $rs->f('user_id'),
-			"user_fullname" => $rs->f('user_fullname'),
+			"user_fullname" => html_entity_decode(stripslashes($rs->f('user_fullname')), ENT_QUOTES, 'UTF-8'),
 			"user_email" => $rs->f('user_email'),
 			"user_lang" => $rs->f('user_lang'),
 			"user_status" => $rs->f('user_status')
@@ -430,7 +430,7 @@
 		$output .= '<tr class="line '.$status.'"><td class="'.$god_class.'" style="text-align: center;"><img src="'.$gravatar_url.'"></td>
 			<td class="'.$god_class.'"><ul>
 				<li>User id : '.$rs->user_id.'</li>
-				<li>Fullname : '.$rs->user_fullname.'</li>
+				<li>Fullname : '.html_entity_decode(stripslashes($rs->user_fullname), ENT_QUOTES, 'UTF-8').'</li>
 				<li>Email : '.$rs->user_email.'</li>';
 		if ($is_god) {
 			$output .= '<li>'.T_('Planet author').'<li>';

=== modified file 'admin/meta/js/manage-user.js' (properties changed: -x to +x)
--- admin/meta/js/manage-user.js	2010-12-21 14:18:06 +0000
+++ admin/meta/js/manage-user.js	2011-03-07 12:46:14 +0000
@@ -164,7 +164,7 @@
 		success: function(user){			
 			$('#user-edit-form #euser_id').val(user.user_id);
 			$('#user-edit-form #euser_id').attr('disabled', 'true');
-			$('#user-edit-form #efullname').val(unescape(user.user_fullname));
+			$('#user-edit-form #efullname').val(user.user_fullname);
 			$('#user-edit-form #eemail').val(user.user_email);
 			var content = $('#user-edit-form form').clone();