diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-02 17:50:31 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-03-02 17:50:31 -0600 |
| commit | bee4f8d8185d4ff5278be758db4ea4a814f09b4f (patch) | |
| tree | 60b12301b5fdbf3edf5477740dbd037ec1e50180 | |
| parent | e33c8e2bb601bd32d55959e6896222a43ae6669f (diff) | |
| parent | fb371d6bbeb67abed3cd4c3f05906e02c2d2dce2 (diff) | |
| download | forums-bee4f8d8185d4ff5278be758db4ea4a814f09b4f.tar forums-bee4f8d8185d4ff5278be758db4ea4a814f09b4f.tar.gz forums-bee4f8d8185d4ff5278be758db4ea4a814f09b4f.tar.bz2 forums-bee4f8d8185d4ff5278be758db4ea4a814f09b4f.tar.xz forums-bee4f8d8185d4ff5278be758db4ea4a814f09b4f.zip | |
Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
# 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
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_pm_history.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_pm_history.html | 2 |
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 6abc9b1402..3d886b1c3d 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}{L_COLON} <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 0cbbf33fbe..4f2b627b50 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> |