[Phpbb-checkins] r10105 - in /branches/phpBB-3_0_0/phpBB: docs/ includes/ install/ install/schemas/

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Author: acydburn
Date: Fri Sep  4 16:19:26 2009
New Revision: 10105

Log:
Change version numbers to 3.0.6 and 3.0.6-RC1 for a final internal test run

Modified:
    branches/phpBB-3_0_0/phpBB/docs/INSTALL.html
    branches/phpBB-3_0_0/phpBB/includes/constants.php
    branches/phpBB-3_0_0/phpBB/install/database_update.php
    branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
    branches/phpBB-3_0_0/phpBB/styles/prosilver/imageset/imageset.cfg
    branches/phpBB-3_0_0/phpBB/styles/prosilver/style.cfg
    branches/phpBB-3_0_0/phpBB/styles/prosilver/template/template.cfg
    branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/theme.cfg
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/imageset.cfg
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/style.cfg
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/template.cfg
    branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/theme.cfg

Modified: branches/phpBB-3_0_0/phpBB/docs/INSTALL.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/INSTALL.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/INSTALL.html Fri Sep  4 16:19:26 2009
***************
*** 273,279 ****

This package is meant for those wanting to only replace changed files from a previous version to the latest version. This package normally contains the changed files from up to five previous versions.

! 	This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have <samp>3.0.4</samp> you should select the phpBB-3.0.4_to_3.0.5.zip/tar.gz file.

The directory structure has been preserved enabling you (if you wish) to simply upload the contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any MODs these files will overwrite the originals possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.

--- 273,279 ----

This package is meant for those wanting to only replace changed files from a previous version to the latest version. This package normally contains the changed files from up to five previous versions.

! 	This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have <samp>3.0.5</samp> you should select the phpBB-3.0.5_to_3.0.6.zip/tar.gz file.

The directory structure has been preserved enabling you (if you wish) to simply upload the contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any MODs these files will overwrite the originals possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.

***************
*** 285,291 ****

The patch file is one solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files if they use the method explained above. To use this you will need command line access to a standard UNIX type patch application. If you do not have access to such an application but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the recommended update method.

! 	A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.4 you need the phpBB-3.0.4_to_3.0.5.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.

If you do get failures you should look at using the <a href="#update_files">Changed files only</a> package to replace the files which failed to patch, please note that you will need to manually re-add any Modifications (MODs) to these particular files. Alternatively if you know how you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.

--- 285,291 ----

The patch file is one solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files if they use the method explained above. To use this you will need command line access to a standard UNIX type patch application. If you do not have access to such an application but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the recommended update method.

! 	A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.5 you need the phpBB-3.0.5_to_3.0.6.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME] (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.

If you do get failures you should look at using the <a href="#update_files">Changed files only</a> package to replace the files which failed to patch, please note that you will need to manually re-add any Modifications (MODs) to these particular files. Alternatively if you know how you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.

Modified: branches/phpBB-3_0_0/phpBB/includes/constants.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/constants.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/constants.php Fri Sep  4 16:19:26 2009
***************
*** 25,31 ****
  */

  // phpBB Version
! define('PHPBB_VERSION', '3.0.5');

  // QA-related
  // define('PHPBB_QA', 1);
--- 25,31 ----
  */

  // phpBB Version
! define('PHPBB_VERSION', '3.0.6-RC1');

  // QA-related
  // define('PHPBB_QA', 1);

Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Fri Sep  4 16:19:26 2009
***************
*** 8,14 ****
  *
  */

! $updates_to_version = '3.0.6-alpha';

  // 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-RC1';

  // Enter any version to update from to test updates. The version within the db will not be updated.
  $debug_from_version = false;

Modified: branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql Fri Sep  4 16:19:26 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-alpha');
  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-RC1');
  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');

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/imageset/imageset.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/imageset/imageset.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/imageset/imageset.cfg Fri Sep  4 16:19:26 2009
***************
*** 19,25 ****
  # General Information about this style
  name = prosilver
  copyright = &copy; phpBB Group, 2007
! version = 3.0.5

  # Images
  img_site_logo = site_logo.gif*52*139
--- 19,25 ----
  # General Information about this style
  name = prosilver
  copyright = &copy; phpBB Group, 2007
! version = 3.0.6

  # Images
  img_site_logo = site_logo.gif*52*139

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/style.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/style.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/style.cfg Fri Sep  4 16:19:26 2009
***************
*** 19,22 ****
  # General Information about this style
  name = prosilver
  copyright = &copy; phpBB Group, 2007
! version = 3.0.5
\ No newline at end of file
--- 19,22 ----
  # General Information about this style
  name = prosilver
  copyright = &copy; phpBB Group, 2007
! version = 3.0.6
\ No newline at end of file

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/template.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/template.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/template.cfg Fri Sep  4 16:19:26 2009
***************
*** 19,25 ****
  # General Information about this template
  name = prosilver
  copyright = &copy; phpBB Group, 2007
! version = 3.0.5

  # Defining a different template bitfield
  template_bitfield = lNg=
--- 19,25 ----
  # General Information about this template
  name = prosilver
  copyright = &copy; phpBB Group, 2007
! version = 3.0.6

  # Defining a different template bitfield
  template_bitfield = lNg=

Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/theme.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/theme.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/theme.cfg Fri Sep  4 16:19:26 2009
***************
*** 21,27 ****
  # General Information about this theme
  name = prosilver
  copyright = &copy; phpBB Group, 2007
! version = 3.0.5

  # Some configuration options

--- 21,27 ----
  # General Information about this theme
  name = prosilver
  copyright = &copy; phpBB Group, 2007
! version = 3.0.6

  # Some configuration options

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/imageset.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/imageset.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/imageset.cfg Fri Sep  4 16:19:26 2009
***************
*** 19,25 ****
  # General Information about this style
  name = subsilver2
  copyright = &copy; phpBB Group, 2003
! version = 3.0.5

  # Images 
  img_site_logo = site_logo.gif*94*170
--- 19,25 ----
  # General Information about this style
  name = subsilver2
  copyright = &copy; phpBB Group, 2003
! version = 3.0.6

  # Images 
  img_site_logo = site_logo.gif*94*170

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/style.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/style.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/style.cfg Fri Sep  4 16:19:26 2009
***************
*** 19,22 ****
  # General Information about this style
  name = subsilver2
  copyright = &copy; 2005 phpBB Group
! version = 3.0.5
--- 19,22 ----
  # General Information about this style
  name = subsilver2
  copyright = &copy; 2005 phpBB Group
! version = 3.0.6

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/template.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/template.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/template.cfg Fri Sep  4 16:19:26 2009
***************
*** 19,23 ****
  # General Information about this template
  name = subsilver2
  copyright = &copy; phpBB Group, 2003
! version = 3.0.5

--- 19,23 ----
  # General Information about this template
  name = subsilver2
  copyright = &copy; phpBB Group, 2003
! version = 3.0.6

Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/theme.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/theme.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/theme.cfg Fri Sep  4 16:19:26 2009
***************
*** 21,27 ****
  # General Information about this theme
  name = subsilver2
  copyright = &copy; phpBB Group, 2003
! version = 3.0.5

  # Some configuration options

--- 21,27 ----
  # General Information about this theme
  name = subsilver2
  copyright = &copy; phpBB Group, 2003
! version = 3.0.6

  # Some configuration options

[Phpbb-checkins] r10105 - in /branches/phpBB-3_0_0/phpBB: docs/ includes/ install/ install/schemas/

phpBB is the world's leading open source discussion forum software.

[Phpbb-checkins] r10105 - in /branches/phpBB-3_0_0/phpBB: docs/ includes/ install/ install/schemas/ styles/prosilver/ styles/prosilver/imageset/ styles/prosilver/template/ styles/prosilver/theme/ styles/subsilver2/ styles/subsilver2/imageset/ styles/subsilver2/template/ styles/subsilver2/theme/