3 files changed, 10 insertions, 11 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 87dfdf902b..3d95dc9a97 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -1081,6 +1081,7 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 		'S_SAVE_ALLOWED'		=> ($auth->acl_get('u_savedrafts') && $action != 'edit') ? true : false,
 		'S_HAS_DRAFTS'			=> ($auth->acl_get('u_savedrafts') && $drafts),
 		'S_FORM_ENCTYPE'		=> $form_enctype,
+		'S_ATTACH_DATA'			=> json_encode($message_parser->attachment_data),
 
 		'S_BBCODE_IMG'			=> $img_status,
 		'S_BBCODE_FLASH'		=> $flash_status,
@@ -1104,7 +1105,8 @@ function compose_pm($id, $mode, $action, $user_folders = array())
 
 	if ($allowed)
 	{
-		$plupload->configure($cache, $template, $s_action, false);
+		$max_files = ($auth->acl_gets('a_', 'm_')) ? 0 : (int) $config['max_attachments_pm'];
+		$plupload->configure($cache, $template, $s_action, false, $max_files);
 	}
 
 	// Attachment entry
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index b68389cba7..03064a31d3 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -338,13 +338,13 @@ function get_user_information($user_id, $user_row)
 		}
 	}
 
-	if (!function_exists('phpbb_get_user_avatar'))
+	$user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : '';
+
+	if (!function_exists('get_user_rank'))
 	{
 		include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
 	}
 
-	$user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : '';
-
 	get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']);
 
 	if ((!empty($user_row['user_allow_viewemail']) && $auth->acl_get('u_sendemail')) || $auth->acl_get('a_email'))
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 3772d56e28..00b53b6576 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -515,10 +515,6 @@ class ucp_profile
 			break;
 
 			case 'avatar':
-				if (!function_exists('phpbb_get_user_avatar'))
-				{
-					include($phpbb_root_path . 'includes/functions_display.' . $phpEx);
-				}
 
 				add_form_key('ucp_avatar');
 
@@ -676,15 +672,14 @@ class ucp_profile
 
 				$sql = 'SELECT key_id, last_ip, last_login
 					FROM ' . SESSIONS_KEYS_TABLE . '
-					WHERE user_id = ' . (int) $user->data['user_id'];
+					WHERE user_id = ' . (int) $user->data['user_id'] . '
+					ORDER BY last_login ASC';
 
 				$result = $db->sql_query($sql);
 
 				while ($row = $db->sql_fetchrow($result))
 				{
 					$template->assign_block_vars('sessions', array(
-						'errors' => $error,
-
 						'KEY' => $row['key_id'],
 						'IP' => $row['last_ip'],
 						'LOGIN_TIME' => $user->format_date($row['last_login']),
@@ -697,6 +692,8 @@ class ucp_profile
 		}
 
 		$template->assign_vars(array(
+			'ERROR'		=> (sizeof($error)) ? implode('<br />', $error) : '',
+
 			'L_TITLE'	=> $user->lang['UCP_PROFILE_' . strtoupper($mode)],
 
 			'S_HIDDEN_FIELDS'	=> $s_hidden_fields,