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

Merge branch 'ticket/nickvergessen/10045' into develop

Browse source 
* ticket/nickvergessen/10045:
  [ticket/10045] Update version in some more files.
  [ticket/10045] Database updater version for 3.1-changes should be 3.1.0-dev
This commit is contained in:
Igor Wiedler 2011-02-16 16:13:37 +01:00
commit 19a0c16ed6
12 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/constants.php
View file

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

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

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

8
phpBB/install/database_update.php
View file

@ -2,13 +2,12 @@
/**
*
* @package install
* @version $Id$
* @copyright (c) 2006 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License
*
*/
$updates_to_version = '3.0.9-dev';
$updates_to_version = '3.1.0-dev';
// Enter any version to update from to test updates. The version within the db will not be updated.
$debug_from_version = false;
@ -921,6 +920,8 @@ function database_update_info()
'3.0.7-PL1' => array(),
// No changes from 3.0.8-RC1 to 3.0.8
'3.0.8-RC1' => array(),
// No changes from 3.1.0-dev to 3.1.0-A1
'3.1.0-dev' => array(),
);
}
@ -1864,7 +1865,8 @@ function change_database_data(&$no_updates, $version)
case '3.0.8-RC1':
break;
case '3.0.9-dev':
// Changes from 3.1.0-dev to 3.1.0-A1
case '3.1.0-dev':
set_config('use_system_cron', 0);
break;
}

2
phpBB/install/schemas/schema_data.sql
View file

@ -243,7 +243,7 @@ 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 ('use_system_cron', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.9-dev');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-dev');
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');

2
phpBB/styles/prosilver/imageset/imageset.cfg
View file

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

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

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

2
phpBB/styles/prosilver/template/template.cfg
View file

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

2
phpBB/styles/prosilver/theme/theme.cfg
View file

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

2
phpBB/styles/subsilver2/imageset/imageset.cfg
View file

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

2
phpBB/styles/subsilver2/style.cfg
View file

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

2
phpBB/styles/subsilver2/template/template.cfg
View file

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

2
phpBB/styles/subsilver2/theme/theme.cfg
View file

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