diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:59:09 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-06 13:59:09 +0200 |
| commit | c7d29fbdb1bb0d265e7791ce40699def97f4388e (patch) | |
| tree | e8ec269bdf1022b59dbebd101932ebb1db361648 /phpBB/styles/prosilver/template | |
| parent | 1b3d54f5dd38bc1bbb5d1f4d87ad53e04e8a9bf6 (diff) | |
| parent | 717f8a6671a216b4d9985c286454b47cd9cb8691 (diff) | |
| download | forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar.gz forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar.bz2 forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.tar.xz forums-c7d29fbdb1bb0d265e7791ce40699def97f4388e.zip | |
Merge pull request #2373 from Nicofuma/ticket/12459
[ticket/12459] Unapproved posts/topics are not correctly handled in feeds
* Nicofuma/ticket/12459:
[ticket/12459] Change language strings
[ticket/12459] Enable related tests
[ticket/12459] Fix: Differentiating unapproved and deleted posts
[ticket/12459] Fix: Soft deleted topics should appear in feeds
[ticket/12459] Fix: the posts were always marked as unapproved
Diffstat (limited to 'phpBB/styles/prosilver/template')
| -rw-r--r-- | phpBB/styles/prosilver/template/viewtopic_body.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index ed45835da6..6adb690391 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -214,7 +214,7 @@ <!-- IF postrow.S_POST_UNAPPROVED --> <form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}"> <p class="post-notice unapproved"> - <strong>{L_POST_UNAPPROVED}</strong> + <strong>{L_POST_UNAPPROVED_ACTION}</strong> <input class="button2" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" /> <input class="button1" type="submit" value="{L_APPROVE}" name="action[approve]" /> <input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" /> @@ -224,7 +224,7 @@ <!-- ELSEIF postrow.S_POST_DELETED --> <form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}"> <p class="post-notice deleted"> - <strong>{L_POST_DELETED}</strong> + <strong>{L_POST_DELETED_ACTION}</strong> <input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" /> <input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" /> <input type="hidden" name="post_id_list[]" value="{postrow.POST_ID}" /> |