[Phpbb-checkins] r10268 - in /branches/phpBB-3_0_6/phpBB: ./ includes/constants.php install/database_update.php install/schemas/schema_data.sql

[Meik S. <acy...@ph...>]

Author: acydburn
Date: Sat Nov 14 20:15:50 2009
New Revision: 10268

Log:
merge r10267

Modified:
    branches/phpBB-3_0_6/phpBB/   (props changed)
    branches/phpBB-3_0_6/phpBB/includes/constants.php
    branches/phpBB-3_0_6/phpBB/install/database_update.php
    branches/phpBB-3_0_6/phpBB/install/schemas/schema_data.sql

Propchange: branches/phpBB-3_0_6/phpBB/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Sat Nov 14 20:15:50 2009
***************
*** 1 ****
! /branches/phpBB-3_0_0/phpBB:10260,10262
--- 1 ----
! /branches/phpBB-3_0_0/phpBB:10260,10262,10267

Modified: branches/phpBB-3_0_6/phpBB/includes/constants.php
==============================================================================
*** branches/phpBB-3_0_6/phpBB/includes/constants.php (original)
--- branches/phpBB-3_0_6/phpBB/includes/constants.php Sat Nov 14 20:15:50 2009
***************
*** 25,31 ****
  */
  
  // phpBB Version
! define('PHPBB_VERSION', '3.0.6-RC4');
  
  // QA-related
  // define('PHPBB_QA', 1);
--- 25,31 ----
  */
  
  // phpBB Version
! define('PHPBB_VERSION', '3.0.6');
  
  // QA-related
  // define('PHPBB_QA', 1);

Modified: branches/phpBB-3_0_6/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_6/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_6/phpBB/install/database_update.php Sat Nov 14 20:15:50 2009
***************
*** 8,14 ****
  *
  */
  
! $updates_to_version = '3.0.6-RC4';
  
  // Enter any version to update from to test updates. The version within the db will not be updated.
  $debug_from_version = false;
--- 8,14 ----
  *
  */
  
! $updates_to_version = '3.0.6';
  
  // Enter any version to update from to test updates. The version within the db will not be updated.
  $debug_from_version = false;
***************
*** 891,896 ****
--- 891,898 ----
  		'3.0.6-RC2'		=> array(),
  		// No changes from 3.0.6-RC3 to 3.0.6-RC4
  		'3.0.6-RC3'		=> array(),
+ 		// No changes from 3.0.6-RC4 to 3.0.6
+ 		'3.0.6-RC4'		=> array(),
  	);
  }
  
***************
*** 1559,1564 ****
--- 1561,1570 ----
  		// No changes from 3.0.6-RC3 to 3.0.6-RC4
  		case '3.0.6-RC3':
  		break;
+ 
+ 		// No changes from 3.0.6-RC4 to 3.0.6
+ 		case '3.0.6-RC3':
+ 		break;
  	}
  }
  

Modified: branches/phpBB-3_0_6/phpBB/install/schemas/schema_data.sql
==============================================================================
*** branches/phpBB-3_0_6/phpBB/install/schemas/schema_data.sql (original)
--- branches/phpBB-3_0_6/phpBB/install/schemas/schema_data.sql Sat Nov 14 20:15:50 2009
***************
*** 239,245 ****
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6-RC4');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
  
--- 239,245 ----
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
  INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');