[Phpbb-checkins] r9948 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html install/install_update.php

[Andreas F. <ba...@ph...>]

Author: bantu
Date: Mon Aug 10 13:12:45 2009
New Revision: 9948

Log:
Bugs #15809, #49215 - Allow updater to work correctly with PHP filename extensions other than .php.
Related revisions: r9935, r9936

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/install/install_update.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 Mon Aug 10 13:12:45 2009
***************
*** 190,195 ****
--- 190,196 ----
  		<li>[Fix] Do not mark global announcements as read if all topics in a forum become read (Bug #15729).</li>
  		<li>[Fix] Fix general error while registration, through undefined variable $config in validate_referer (Bug #49035 - Patch by wjvriend)</li>
  		<li>[Fix] Correctly extract column default value when exporting PostgreSQL tables. (Bug #48955)</li>
+ 		<li>[Fix] Allow updater to work correctly with PHP filename extensions other than &quot;.php&quot;. (Bugs #15809, #49215)</li>
  		<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</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>

Modified: branches/phpBB-3_0_0/phpBB/install/install_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/install_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/install_update.php Mon Aug 10 13:12:45 2009
***************
*** 203,209 ****
  			}
  
  			// What about the language file? Got it updated?
! 			if (in_array('language/en/install.php', $this->update_info['files']))
  			{
  				$lang = array();
  				include($this->new_location . 'language/en/install.' . $phpEx);
--- 203,209 ----
  			}
  
  			// What about the language file? Got it updated?
! 			if (in_array('language/en/install.' . $phpEx, $this->update_info['files']))
  			{
  				$lang = array();
  				include($this->new_location . 'language/en/install.' . $phpEx);
***************
*** 1577,1582 ****
--- 1577,1588 ----
  
  				if ($info !== false)
  				{
+ 					// We assume that all file extensions have been renamed to .$phpEx,
+ 					// if someone is using a non .php file extension for php files.
+ 					// However, in $update_info['files'] we use hardcoded .php.
+ 					// We therefore replace .php with .$phpEx.
+ 					$info['files'] = preg_replace('/\.php$/i', ".$phpEx", $info['files']);
+ 
  					// Adjust the update info file to hold some specific style-related information
  					$info['custom'] = array();
  /*