1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

dumdidum...

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9155 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-12-02 17:13:34 +00:00
parent 9ad79023b1
commit 83839139e6
12 changed files with 13 additions and 13 deletions

View File

@ -273,7 +273,7 @@
<p>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.</p> <p>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.</p>
<p>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.2</samp> you should select the phpBB-3.0.2_to_3.0.3.zip/tar.gz file.</p> <p>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.3</samp> you should select the phpBB-3.0.3_to_3.0.4.zip/tar.gz file.</p>
<p>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.</p> <p>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.</p>
@ -285,7 +285,7 @@
<p>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 <strong>patch</strong> 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 preferred update method.</p> <p>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 <strong>patch</strong> 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 preferred update method.</p>
<p>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.2 you need the phpBB-3.0.2_to_3.0.3.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: <strong>patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME]</strong> (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.</p> <p>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.3 you need the phpBB-3.0.3_to_3.0.4.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: <strong>patch -cl -d [PHPBB DIRECTORY] -p1 &lt; [PATCH NAME]</strong> (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.</p>
<p>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.</p> <p>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.</p>

View File

@ -25,7 +25,7 @@ if (!defined('IN_PHPBB'))
*/ */
// phpBB Version // phpBB Version
define('PHPBB_VERSION', '3.0.3'); define('PHPBB_VERSION', '3.0.4-RC1');
// QA-related // QA-related
// define('PHPBB_QA', 1); // define('PHPBB_QA', 1);

View File

@ -32,7 +32,7 @@ unset($dbpasswd);
$convertor_data = array( $convertor_data = array(
'forum_name' => 'phpBB 2.0.x', 'forum_name' => 'phpBB 2.0.x',
'version' => '1.0.2', 'version' => '1.0.2',
'phpbb_version' => '3.0.3', 'phpbb_version' => '3.0.4',
'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>', 'author' => '<a href="http://www.phpbb.com/">phpBB Group</a>',
'dbms' => $dbms, 'dbms' => $dbms,
'dbhost' => $dbhost, 'dbhost' => $dbhost,

View File

@ -218,7 +218,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0'); 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_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 ('upload_path', 'files');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.4-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.4-RC1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); 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'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');

View File

@ -19,7 +19,7 @@
# General Information about this style # General Information about this style
name = prosilver name = prosilver
copyright = &copy; phpBB Group, 2007 copyright = &copy; phpBB Group, 2007
version = 3.0.3 version = 3.0.4
# Images # Images
img_site_logo = site_logo.gif*52*139 img_site_logo = site_logo.gif*52*139

View File

@ -19,4 +19,4 @@
# General Information about this style # General Information about this style
name = prosilver name = prosilver
copyright = &copy; phpBB Group, 2007 copyright = &copy; phpBB Group, 2007
version = 3.0.3 version = 3.0.4

View File

@ -19,7 +19,7 @@
# General Information about this template # General Information about this template
name = prosilver name = prosilver
copyright = &copy; phpBB Group, 2007 copyright = &copy; phpBB Group, 2007
version = 3.0.3 version = 3.0.4
# Defining a different template bitfield # Defining a different template bitfield
template_bitfield = lNg= template_bitfield = lNg=

View File

@ -21,7 +21,7 @@
# General Information about this theme # General Information about this theme
name = prosilver name = prosilver
copyright = &copy; phpBB Group, 2007 copyright = &copy; phpBB Group, 2007
version = 3.0.3 version = 3.0.4
# Some configuration options # Some configuration options

View File

@ -19,7 +19,7 @@
# General Information about this style # General Information about this style
name = subsilver2 name = subsilver2
copyright = &copy; phpBB Group, 2003 copyright = &copy; phpBB Group, 2003
version = 3.0.3 version = 3.0.4
# Images # Images
img_site_logo = site_logo.gif*94*170 img_site_logo = site_logo.gif*94*170

View File

@ -19,4 +19,4 @@
# General Information about this style # General Information about this style
name = subsilver2 name = subsilver2
copyright = &copy; 2005 phpBB Group copyright = &copy; 2005 phpBB Group
version = 3.0.3 version = 3.0.4

View File

@ -19,5 +19,5 @@
# General Information about this template # General Information about this template
name = subsilver2 name = subsilver2
copyright = &copy; phpBB Group, 2003 copyright = &copy; phpBB Group, 2003
version = 3.0.3 version = 3.0.4

View File

@ -21,7 +21,7 @@
# General Information about this theme # General Information about this theme
name = subsilver2 name = subsilver2
copyright = &copy; phpBB Group, 2003 copyright = &copy; phpBB Group, 2003
version = 3.0.3 version = 3.0.4
# Some configuration options # Some configuration options