diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2010-01-26 14:06:00 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2010-01-26 14:06:00 +0000 |
| commit | 283ad368eb6e92a51a7c0b5dcaf3d1050f7a9b9c (patch) | |
| tree | 761f49a07581c2d5092919c9634c23cf26d190f2 /phpBB | |
| parent | 8a9c7c92bef76a8dfbb72556aaf55f961aa711b3 (diff) | |
| download | forums-283ad368eb6e92a51a7c0b5dcaf3d1050f7a9b9c.tar forums-283ad368eb6e92a51a7c0b5dcaf3d1050f7a9b9c.tar.gz forums-283ad368eb6e92a51a7c0b5dcaf3d1050f7a9b9c.tar.bz2 forums-283ad368eb6e92a51a7c0b5dcaf3d1050f7a9b9c.tar.xz forums-283ad368eb6e92a51a7c0b5dcaf3d1050f7a9b9c.zip | |
Bug #54745 - Fix language string for PM-Reports refering to post-data.
Authorised by: jelly_doughnut
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10455 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 1 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_post.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/mcp_post.html | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 47a8034baa..db7c598bb4 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -143,12 +143,13 @@ <li>[Fix] Do not automatically unsubscribe users from topics, when email and jabber is disabled.</li> <li>[Fix] Don't send activation email when user tries to change email without permission (fix by nrohler). (Bug #56335)</li> <li>[Fix] Replace hard coded "px" with translated language-string. (Bug #52495)</li> - <li>[Fix] Correctly hover list menu in UCP and MCP for rtl languages. (Bug #49945)</li> + <li>[Fix] Correctly hover list menu in UCP and MCP for RTL languages. (Bug #49945)</li> <li>[Fix] Correctly orientate quoted text image on RTL languages. (Bug #33745)</li> <li>[Fix] Deprecate $allow_reply parameter to truncate_string() (Bug #56675)</li> <li>[Fix] Fall back to default language email template if specified file does not exist. (Bug #35595)</li> <li>[Fix] Update users last visit field correctly when changing activation status. (Bug #56185)</li> <li>[Fix] Database updater now separates ADD COLUMN from SET NOT NULL and SET DEFAULT, when using PostgreSQL <= 7.4 (Bug #54435)</li> + <li>[Fix] Fix language string for PM-Reports refering to post-data. (Bug #54745)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 2e988e2d42..fc1b8c8f62 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -329,6 +329,7 @@ $lang = array_merge($lang, array( 'SPLIT_TOPIC_BEYOND_CONFIRM' => 'Are you sure you want to split this topic at the selected post?', 'SPLIT_TOPIC_EXPLAIN' => 'Using the form below you can split a topic in two, either by selecting the posts individually or by splitting at a selected post.', + 'THIS_PM_IP' => 'IP for this private message', 'THIS_POST_IP' => 'IP for this post', 'TOPICS_APPROVED_SUCCESS' => 'The selected topics have been approved.', 'TOPICS_DELETED_SUCCESS' => 'The selected topics have been successfully removed from the database.', diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html index 8a3c8e7309..0265d7ce12 100644 --- a/phpBB/styles/prosilver/template/mcp_post.html +++ b/phpBB/styles/prosilver/template/mcp_post.html @@ -103,7 +103,7 @@ <!-- IF S_MCP_REPORT and S_CAN_VIEWIP --> <hr /> - <div>{L_THIS_POST_IP}: <!-- IF U_WHOIS --> + <div><!-- IF S_PM -->{L_THIS_PM_IP}<!-- ELSE -->{L_THIS_POST_IP}<!-- ENDIF -->: <!-- IF U_WHOIS --> <a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->) <!-- ELSE --> <!-- IF POST_IPADDR -->{POST_IPADDR} ({POST_IP})<!-- ELSE -->{POST_IP}<!-- IF U_LOOKUP_IP --> (<a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a>)<!-- ENDIF --><!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/mcp_post.html b/phpBB/styles/subsilver2/template/mcp_post.html index ecf4558b45..6fb68ca680 100644 --- a/phpBB/styles/subsilver2/template/mcp_post.html +++ b/phpBB/styles/subsilver2/template/mcp_post.html @@ -58,7 +58,7 @@ </tr> <!-- IF S_CAN_VIEWIP --> <tr> - <td class="row1"><b class="gen">{L_THIS_POST_IP}: </b></td> + <td class="row1"><b class="gen"><!-- IF S_PM -->{L_THIS_PM_IP}<!-- ELSE -->{L_THIS_POST_IP}<!-- ENDIF -->: </b></td> <td class="row2"><span class="gen"> <!-- IF U_WHOIS --> <a href="{U_WHOIS}"><!-- IF POST_IPADDR -->{POST_IPADDR}<!-- ELSE -->{POST_IP}<!-- ENDIF --></a> (<!-- IF POST_IPADDR -->{POST_IP}<!-- ELSE --><a href="{U_LOOKUP_IP}">{L_LOOKUP_IP}</a><!-- ENDIF -->) |