makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14495] Revert changes in master

Browse source 
PHPBB3-14495
This commit is contained in:
Tristan Darricau 2016-04-02 12:12:24 +02:00
parent 2b5037ee96
commit 93f932b80f
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/composer.json
View file

@ -62,7 +62,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.2.x-dev" "dev-master": "3.3.x-dev"
} }
} }
} }

4
phpBB/composer.lock generated
View file

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "9cbb41222e71eb86e0ef9118baafc691", "hash": "e61304256160e9e0c521a4996912d65d",
"content-hash": "03a990fa2d088c89afe4824d2d53e873", "content-hash": "64ae8ac9ac0cc8b1f47e58f43e2d7461",
"packages": [ "packages": [
{ {
"name": "bantu/ini-get-wrapper", "name": "bantu/ini-get-wrapper",

6
phpBB/docs/README.html
View file

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="" /> <meta name="keywords" content="" />
<meta name="description" content="phpBB 3.2.x Readme" /> <meta name="description" content="phpBB 3.3.x Readme" />
<title>phpBB &bull; Readme</title> <title>phpBB &bull; Readme</title>
<link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" /> <link href="assets/css/stylesheet.css" rel="stylesheet" type="text/css" media="screen" />
@ -21,7 +21,7 @@
<div id="doc-description"> <div id="doc-description">
<a href="../index.php" id="logo"><img src="assets/images/site_logo.gif" alt="" /></a> <a href="../index.php" id="logo"><img src="assets/images/site_logo.gif" alt="" /></a>
<h1>phpBB 3.2.x Readme</h1> <h1>phpBB 3.3.x Readme</h1>
<p style="display: none;"><a href="#start_here">Skip</a></p> <p style="display: none;"><a href="#start_here">Skip</a></p>
</div> </div>
@ -324,7 +324,7 @@
<div class="content"> <div class="content">
<p>phpBB 3.2.x takes advantage of new features added in PHP 5.4. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 5.4.0 and the maximum supported version is PHP 7.0.</p> <p>phpBB 3.3.x takes advantage of new features added in PHP 5.4. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 5.4.0 and the maximum supported version is PHP 7.0.</p>
<p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p> <p>Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.</p>

2
phpBB/install/convertors/convert_phpbb20.php
View file

@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
$convertor_data = array( $convertor_data = array(
'forum_name' => 'phpBB 2.0.x', 'forum_name' => 'phpBB 2.0.x',
'version' => '1.0.3', 'version' => '1.0.3',
'phpbb_version' => '3.2.0-b3-dev', 'phpbb_version' => '3.3.0-a1-dev',
'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>', 'author' => '<a href="https://www.phpbb.com/">phpBB Limited</a>',
'dbms' => $dbms, 'dbms' => $dbms,
'dbhost' => $dbhost, 'dbhost' => $dbhost,

2
phpBB/install/phpbbcli.php
View file

@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli')
define('IN_PHPBB', true); define('IN_PHPBB', true);
define('IN_INSTALL', true); define('IN_INSTALL', true);
define('PHPBB_ENVIRONMENT', 'production'); define('PHPBB_ENVIRONMENT', 'production');
define('PHPBB_VERSION', '3.2.0-b3-dev'); define('PHPBB_VERSION', '3.3.0-a1-dev');
$phpbb_root_path = __DIR__ . '/../'; $phpbb_root_path = __DIR__ . '/../';
$phpEx = substr(strrchr(__FILE__, '.'), 1); $phpEx = substr(strrchr(__FILE__, '.'), 1);

2
phpBB/language/en/install.php
View file

@ -523,7 +523,7 @@ $lang = array_merge($lang, array(
// Finish conversion // Finish conversion
'CONVERT_COMPLETE' => 'Conversion completed', 'CONVERT_COMPLETE' => 'Conversion completed',
'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.2. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="https://www.phpbb.com/support/docs/en/3.3/ug/">Documentation</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=466">support forums</a>.', 'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.3. You can now login and <a href="../">access your board</a>. Please ensure that the settings were transferred correctly before enabling your board by deleting the install directory. Remember that help on using phpBB is available online via the <a href="https://www.phpbb.com/support/docs/en/3.3/ug/">Documentation</a> and the <a href="https://www.phpbb.com/community/viewforum.php?f=466">support forums</a>.',
'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.', 'CONV_ERROR_ATTACH_FTP_DIR' => 'FTP upload for attachments is enabled at the old board. Please disable the FTP upload option and make sure a valid upload directory is specified, then copy all attachment files to this new web accessible directory. Once you have done this, restart the convertor.',
'CONV_ERROR_CONFIG_EMPTY' => 'There is no configuration information available for the conversion.', 'CONV_ERROR_CONFIG_EMPTY' => 'There is no configuration information available for the conversion.',

4
phpBB/styles/prosilver/style.cfg
View file

@ -21,8 +21,8 @@
# General Information about this style # General Information about this style
name = prosilver name = prosilver
copyright = © phpBB Limited, 2007 copyright = © phpBB Limited, 2007
style_version = 3.2.0-b3-dev style_version = 3.3.0-dev
phpbb_version = 3.2.0-b3-dev phpbb_version = 3.3.0-dev
# Defining a different template bitfield # Defining a different template bitfield
# template_bitfield = lNg= # template_bitfield = lNg=