[Phpbb-checkins] r9846 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html viewtopic.php

[Ruslan U. <rx...@ph...>]

Author: rxu
Date: Fri Jul 24 12:05:17 2009
New Revision: 9846

Log:
Fix bug #38055 - Post reply button shown in locked forum 
Authorised by: AcydBurn

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/viewtopic.php

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Fri Jul 24 12:05:17 2009
***************
*** 175,180 ****
--- 175,181 ----
  		<li>[Fix] Do not add style-parameter to URL again, after admin re-authentification (Bug #18005 - Patch by leviatan21)</li>
  		<li>[Fix] Do not cut post-message in between HTML-Entities on search.php (Bug #31505 - Patch by leviatan21)</li>
  		<li>[Fix] Correctly set attachment flag for topics, posts and pms after deleting attachments (Bug #48265 - Patch by WorldWar and nickvergessen)</li>
+ 		<li>[Fix] Display &quot;Locked&quot; button instead of &quot;Reply&quot; one for locked forum in viewtopic (prosilver). (Bug #38055 - Patch by Raimon)</li>
  		<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
  		<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
  		<li>[Change] Template engine now permits to a limited extent variable includes.</li>

Modified: branches/phpBB-3_0_0/phpBB/viewtopic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/viewtopic.php (original)
--- branches/phpBB-3_0_0/phpBB/viewtopic.php Fri Jul 24 12:05:17 2009
***************
*** 605,611 ****
  	'UNAPPROVED_IMG'	=> $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
  	'WARN_IMG'			=> $user->img('icon_user_warn', 'WARN_USER'),
  
! 	'S_IS_LOCKED'			=>($topic_data['topic_status'] == ITEM_UNLOCKED) ? false : true,
  	'S_SELECT_SORT_DIR' 	=> $s_sort_dir,
  	'S_SELECT_SORT_KEY' 	=> $s_sort_key,
  	'S_SELECT_SORT_DAYS' 	=> $s_limit_days,
--- 605,611 ----
  	'UNAPPROVED_IMG'	=> $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
  	'WARN_IMG'			=> $user->img('icon_user_warn', 'WARN_USER'),
  
! 	'S_IS_LOCKED'			=> ($topic_data['topic_status'] == ITEM_UNLOCKED && $topic_data['forum_status'] == ITEM_UNLOCKED) ? false : true,
  	'S_SELECT_SORT_DIR' 	=> $s_sort_dir,
  	'S_SELECT_SORT_KEY' 	=> $s_sort_key,
  	'S_SELECT_SORT_DAYS' 	=> $s_limit_days,