aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuslan Uzdenov <rxu@mail.ru>2010-01-19 13:33:07 +0000
committerRuslan Uzdenov <rxu@mail.ru>2010-01-19 13:33:07 +0000
commitff0b94f23886ec2ac2c8a68e4aac9d840e6c2c88 (patch)
treeda15e6f7f9c5da8a5c7cff1826757f1f50c04d1e
parentf40418296ac70b182289ff4a929dcf2d661f6ca4 (diff)
downloadforums-ff0b94f23886ec2ac2c8a68e4aac9d840e6c2c88.tar
forums-ff0b94f23886ec2ac2c8a68e4aac9d840e6c2c88.tar.gz
forums-ff0b94f23886ec2ac2c8a68e4aac9d840e6c2c88.tar.bz2
forums-ff0b94f23886ec2ac2c8a68e4aac9d840e6c2c88.tar.xz
forums-ff0b94f23886ec2ac2c8a68e4aac9d840e6c2c88.zip
Fix bug #56075 - "Bump Topic" link not showing when bump interval is 0
Authorised by: Jelly_Doughnut git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10429 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/docs/CHANGELOG.html1
-rw-r--r--phpBB/language/en/acp/board.php2
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index c32f72d280..d7cc184f17 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -137,6 +137,7 @@
<li>[Fix] Do not unsubscribe users from topics replying with quickreply. (Bug #56235)</li>
<li>[Fix] Don't submit when pressing enter on preview button. (Bug #54395)</li>
<li>[Fix] Load reCAPTCHA over https when using a secure connection to the board. (Bug #55755)</li>
+ <li>[Fix] Clarify explanation of bump feature setting. (Bug #56075)</li>
<li>[Fix] Properly paginate unapproved posts in the MCP. (Bug #56285)</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>
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 4e7edd577e..5724b9b65c 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -149,7 +149,7 @@ $lang = array_merge($lang, array(
'ALLOW_POST_FLASH_EXPLAIN' => 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the <code>[FLASH]</code> BBCode tag.',
'BUMP_INTERVAL' => 'Bump interval',
- 'BUMP_INTERVAL_EXPLAIN' => 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic.',
+ 'BUMP_INTERVAL_EXPLAIN' => 'Number of minutes, hours or days between the last post to a topic and the ability to bump this topic. Setting the value to 0 disables this feature.',
'CHAR_LIMIT' => 'Maximum characters per post/message',
'CHAR_LIMIT_EXPLAIN' => 'The number of characters allowed within a post/private message. Set to 0 for unlimited characters.',
'DELETE_TIME' => 'Limit deleting time',