mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-16 13:44:12 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop

Browse Source 
# By Marc Alexander
# Via Marc Alexander (1) and Nathaniel Guse (1)
* remotes/upstream/develop-olympus:
  [ticket/6723] Show info that message has been deleted before delivery
This commit is contained in:
Nathaniel Guse
2013-03-02 17:50:31 -06:00
parent e33c8e2bb6 fb371d6bbe
commit bee4f8d818
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/styles/subsilver2/template/ucp_pm_history.html
View File

@@ -37,7 +37,7 @@
<td valign="top">
<table width="100%" cellspacing="0" cellpadding="2">
<tr>
<td><div class="postbody">{history_row.MESSAGE}</div><div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div></td>
<td><div class="postbody"><!-- IF history_row.MESSAGE -->{history_row.MESSAGE}<!-- ELSE --><span class="error">{L_MESSAGE_REMOVED_FROM_OUTBOX}</span><!-- ENDIF --></div><div id="message_{history_row.MSG_ID}" style="display: none;">{history_row.DECODED_MESSAGE}</div></td>
</tr>
</table>
</td>