aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorNathaniel Guse <nathaniel.guse@gmail.com>2013-03-02 17:48:56 -0600
committerNathaniel Guse <nathaniel.guse@gmail.com>2013-03-02 17:48:56 -0600
commitfb371d6bbeb67abed3cd4c3f05906e02c2d2dce2 (patch)
tree4e9c59a28094fb78c8dcd5799123c66307c1535b /phpBB
parentd5617f046c7b4d7db7bb9a2f7e2f56b262ab9013 (diff)
parentacabe6f5ca5dd1ec467d099b834454e14dd02ac7 (diff)
downloadforums-fb371d6bbeb67abed3cd4c3f05906e02c2d2dce2.tar
forums-fb371d6bbeb67abed3cd4c3f05906e02c2d2dce2.tar.gz
forums-fb371d6bbeb67abed3cd4c3f05906e02c2d2dce2.tar.bz2
forums-fb371d6bbeb67abed3cd4c3f05906e02c2d2dce2.tar.xz
forums-fb371d6bbeb67abed3cd4c3f05906e02c2d2dce2.zip
Merge remote-tracking branch 'remotes/marc/ticket/6723' into develop-olympus
# By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/6723: [ticket/6723] Show info that message has been deleted before delivery
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/styles/prosilver/template/ucp_pm_history.html2
-rw-r--r--phpBB/styles/subsilver2/template/ucp_pm_history.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html
index 9051eb2ee0..0767920c1b 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_history.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_history.html
@@ -24,7 +24,7 @@
<h3><a href="{history_row.U_VIEW_MESSAGE}" <!-- IF history_row.S_CURRENT_MSG -->class="current"<!-- ENDIF -->>{history_row.SUBJECT}</a></h3>
<p class="author">{history_row.MINI_POST_IMG} {L_SENT_AT}: <strong>{history_row.SENT_DATE}</strong><br />
{L_MESSAGE_BY_AUTHOR} {history_row.MESSAGE_AUTHOR_FULL}</p>
- <div class="content">{history_row.MESSAGE}</div>
+ <div class="content"><!-- 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>
</div>
diff --git a/phpBB/styles/subsilver2/template/ucp_pm_history.html b/phpBB/styles/subsilver2/template/ucp_pm_history.html
index 8754acaaa2..bf20108f7b 100644
--- a/phpBB/styles/subsilver2/template/ucp_pm_history.html
+++ b/phpBB/styles/subsilver2/template/ucp_pm_history.html
@@ -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>