Browse Source

Similar to 2475065de4ca267ea03cb6568a390f3d6ebc1c68 but for .xml webslice...probably not *so* necessary, just for consistency

Signed-off-by: emanuele <[email protected]>
emanuele 12 years ago
parent
commit
69f9dfba3c
2 changed files with 2 additions and 2 deletions
  1. 1 0
      Sources/News.php
  2. 1 2
      Themes/default/Xml.template.php

+ 1 - 0
Sources/News.php

@@ -260,6 +260,7 @@ function ShowXmlFeed()
 	elseif ($xml_format == 'webslice')
 	{
 		$context['recent_posts_data'] = $xml;
+		$context['can_pm_read'] = allowedTo('pm_read');
 
 		// This always has RSS 2
 		echo '

+ 1 - 2
Themes/default/Xml.template.php

@@ -408,8 +408,7 @@ function template_webslice_recent_posts()
 			<a href="', $scripturl, '?action=login">', $txt['login'], '</a>';
 	else
 		echo '
-			', cleanXml($context['user']['name']), ', ', cleanXml($txt['msg_alert_you_have']), ' <a href="', $scripturl, '?action=pm">', cleanXml($context['user']['messages']), ' ', cleanXml($context['user']['messages'] != 1 ? $txt['msg_alert_messages'] : $txt['message_lowercase']), '</a>', cleanXml($txt['newmessages4'] . ' ' . $context['user']['unread_messages']), ' ', cleanXml($context['user']['unread_messages'] == 1 ? $txt['newmessages0'] : $txt['newmessages1']);
-
+			', cleanXml($context['user']['name']), cleanXml(!empty($context['can_pm_read']) ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '');
 	echo '
 		</div>
 	</div>';