Browse Source

IMHO the reply to all should *always* stay in the PM and not at the top

Signed-off-by: emanuele <[email protected]>
emanuele 12 years ago
parent
commit
fc93e8e15e
2 changed files with 3 additions and 4 deletions
  1. 1 2
      Sources/PersonalMessage.php
  2. 2 2
      Themes/default/PersonalMessage.template.php

+ 1 - 2
Sources/PersonalMessage.php

@@ -862,7 +862,6 @@ function MessageFolder()
 	if ($context['display_mode'] == 2)
 	{
 		$context['conversation_buttons'] = array(
-			'reply' => array('text' => 'reply_to_all', 'image' => 'reply.png', 'lang' => true, 'url' => $scripturl . '?action=pm;sa=send;f=' . $context['folder'] . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '') . ';pmsg=' . $context['current_pm'] . ';u=all', 'active' => true),
 			'delete' => array('text' => 'delete_conversation', 'image' => 'delete.png', 'lang' => true, 'url' => $scripturl . '?action=pm;sa=pmactions;pm_actions[' . $context['current_pm'] . ']=delete;conversation;f=' . $context['folder'] . ';start=' . $context['start'] . ($context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '') . ';' . $context['session_var'] . '=' . $context['session_id'], 'custom' => 'onclick="return confirm(\'' . addslashes($txt['remove_message']) . '?\');"'),
 		);
 
@@ -3710,4 +3709,4 @@ function isAccessiblePM($pmID, $validFor = 'in_or_outbox')
 	}
 }
 
-?>
+?>

+ 2 - 2
Themes/default/PersonalMessage.template.php

@@ -426,7 +426,7 @@ function template_folder()
 				if (!$message['member']['is_guest'])
 				{
 					// Is there than more than one recipient you can reply to?
-					if ($message['number_recipients'] > 1 && $context['display_mode'] != 2)
+					if ($message['number_recipients'] > 1)
 						echo '
 					<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=all" class="reply_all_button">', $txt['reply_to_all'], '</a></li>';
 
@@ -1984,4 +1984,4 @@ function template_showPMDrafts()
 			<span>', $context['page_index'], '</span>
 		</div>';
 }
-?>
+?>