From b6135d3d02285542656b179c32ee7297f29fd5e7 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 30 May 2014 16:23:44 +0200 Subject: [PATCH 1/5] [prep-release-3.1.0-b4] Update version to 3.1.0-b4 --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- phpBB/styles/subsilver2/style.cfg | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/build.xml b/build/build.xml index dbf16acfeb..dcc8159c60 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 602067a0e7..7b2a41048b 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.1.0-b4-dev'); +define('PHPBB_VERSION', '3.1.0-b4'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 0c2d4ebf74..7daacf92f4 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -37,7 +37,7 @@ $dbms = phpbb_convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.1.0-b3', + 'phpbb_version' => '3.1.0-b4', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 7afed448ad..4a23724f40 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -272,7 +272,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.1.0-b4-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-b4'); 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'); diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index b4a96cd811..f3dd72cb52 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.1.0-b3 -phpbb_version = 3.1.0-b3 +style_version = 3.1.0-b4 +phpbb_version = 3.1.0-b4 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index d7cab8ead0..b9e77bfb4f 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = subsilver2 copyright = © 2005 phpBB Limited -style_version = 3.1.0-b3 -phpbb_version = 3.1.0-b3 +style_version = 3.1.0-b4 +phpbb_version = 3.1.0-b4 # Defining a different template bitfield # template_bitfield = lNg= From 0cfc0413ca36230be1d8e3ca97b7c0dea2b99069 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 30 May 2014 16:27:42 +0200 Subject: [PATCH 2/5] [prep-release-3.1.0-b4] Add migration for 3.1.0-b4 --- phpBB/phpbb/db/migration/data/v310/beta4.php | 33 ++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v310/beta4.php diff --git a/phpBB/phpbb/db/migration/data/v310/beta4.php b/phpBB/phpbb/db/migration/data/v310/beta4.php new file mode 100644 index 0000000000..3e91d95178 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/beta4.php @@ -0,0 +1,33 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v310; + +class beta4 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v310\beta3', + '\phpbb\db\migration\data\v310\extensions_version_check_force_unstable', + '\phpbb\db\migration\data\v310\reset_missing_captcha_plugin', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.0-b4')), + ); + } +} From 814b077864366f208c90e99f1a4275338bb62e42 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 30 May 2014 16:32:30 +0200 Subject: [PATCH 3/5] [prep-release-3.1.0-b4] Prepare Changelog --- phpBB/docs/CHANGELOG.html | 57 ++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 36d0ccf68d..070b478e35 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog
      +
    1. Changes since 3.1.0-b3
    2. Changes since 3.1.0-b2
    3. Changes since 3.1.0-b1
    4. Changes since 3.1.0-a3
      5. @@ -92,7 +93,9 @@
      -

      1.i. Changes since 3.1.0-b2

      +

      1.i. Changes since 3.1.0-b3

      + +

      1.ii. Changes since 3.1.0-b2

      Bug

        @@ -257,7 +260,7 @@
      -

      1.ii. Changes since 3.1.0-b1

      +

      1.iii. Changes since 3.1.0-b1

      Bug

        @@ -325,7 +328,7 @@
      • [PHPBB3-12302] - Upgrade composer.phar to 1.0.0-alpha8
      -

      1.iii. Changes since 3.1.0-a3

      +

      1.iv. Changes since 3.1.0-a3

      Bug

        @@ -472,7 +475,7 @@
      -

      1.iv. Changes since 3.1.0-a2

      +

      1.v. Changes since 3.1.0-a2

      Bug

        @@ -580,7 +583,7 @@
      • [PHPBB3-12147] - Remove Travis CI notification configuration
      -

      1.v. Changes since 3.1.0-a1

      +

      1.vi. Changes since 3.1.0-a1

      Bug

        @@ -656,7 +659,7 @@
      • [PHPBB3-11998] - Add console / command line client environment
      -

      1.vi. Changes since 3.0.x

      +

      1.vii. Changes since 3.0.x

      Bug

        @@ -1337,7 +1340,7 @@
      • [PHPBB3-11913] - Apply reorganisation of download.phpbb.com to build_announcement.php
      -

      1.vii. Changes since 3.0.11

      +

      1.viii. Changes since 3.0.11

      Bug

        @@ -1492,7 +1495,7 @@
      • [PHPBB3-11753] - Upgrade mysql_upgrader.php schema data.
      -

      1.viii. Changes since 3.0.10

      +

      1.ix. Changes since 3.0.10

      Bug

        @@ -1617,7 +1620,7 @@
      • [PHPBB3-10909] - Update Travis Test Configuration: Travis no longer supports PHP 5.3.2
      -

      1.ix. Changes since 3.0.9

      +

      1.x. Changes since 3.0.9

      Bug

        @@ -1753,7 +1756,7 @@
      • [PHPBB3-10480] - Automate changelog building
      -

      1.x. Changes since 3.0.8

      +

      1.xi. Changes since 3.0.8

      Bug

      @@ -2121,7 +2124,7 @@ -

      1.xi. Changes since 3.0.7-PL1

      +

      1.xii. Changes since 3.0.7-PL1

      Security

        @@ -2579,13 +2582,13 @@
      -

      1.xii. Changes since 3.0.7

      +

      1.xiii. Changes since 3.0.7

      • [Sec] Do not expose forum content of forums with ACL entries but no actual permission in ATOM Feeds. (Bug #58595)
      -

      1.xiii. Changes since 3.0.6

      +

      1.xiv. Changes since 3.0.6

      • [Fix] Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. (Bug #51095)
        • @@ -2689,7 +2692,7 @@
      -

      1.xiv. Changes since 3.0.5

      +

      1.xv. Changes since 3.0.5

      • [Fix] Allow whitespaces in avatar gallery names. (Bug #44955)
        • @@ -2911,7 +2914,7 @@
      • [Feature] Send anonymous statistical information to phpBB on installation and update (optional).
      -

      1.xv. Changes since 3.0.4

      +

      1.xvi. Changes since 3.0.4

      • [Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)
        • @@ -3000,7 +3003,7 @@
      • [Sec] Only use forum id supplied for posting if global announcement detected. (Reported by nickvergessen)
      -

      1.xvi. Changes since 3.0.3

      +

      1.xvii. Changes since 3.0.3

      • [Fix] Allow mixed-case template directories to be inherited (Bug #36725)
        • @@ -3032,7 +3035,7 @@
      • [Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)
      -

      1.xvii. Changes since 3.0.2

      +

      1.xviii. Changes since 3.0.2

      • [Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)
        • @@ -3131,7 +3134,7 @@
      • [Sec Precaution] Stricter validation of the HTTP_HOST header (Thanks to Techie-Micheal et al for pointing out possible issues in derived code)
      -

      1.xviii. Changes since 3.0.1

      +

      1.xix. Changes since 3.0.1

      • [Fix] Ability to set permissions on non-mysql dbms (Bug #24955)
        • @@ -3179,7 +3182,7 @@
      • [Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)
      -

      1.xix. Changes since 3.0.0

      +

      1.xx. Changes since 3.0.0

      • [Change] Validate birthdays (Bug #15004)
        • @@ -3250,7 +3253,7 @@
      • [Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)
      -

      1.xx. Changes since 3.0.RC8

      +

      1.xxi. Changes since 3.0.RC8

      • [Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)
        • @@ -3259,7 +3262,7 @@
      • [Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)
      -

      1.xxi. Changes since 3.0.RC7

      +

      1.xxii. Changes since 3.0.RC7

      • [Fix] Fixed MSSQL related bug in the update system
        • @@ -3294,7 +3297,7 @@
      • [Fix] No duplication of active topics (Bug #15474)
      -

      1.xxii. Changes since 3.0.RC6

      +

      1.xxiii. Changes since 3.0.RC6

      • [Fix] Submitting language changes using acp_language (Bug #14736)
        • @@ -3304,7 +3307,7 @@
      • [Fix] Able to request new password (Bug #14743)
      -

      1.xxiii. Changes since 3.0.RC5

      +

      1.xxiv. Changes since 3.0.RC5

      • [Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.
        • @@ -3367,7 +3370,7 @@
      • [Sec] New password hashing mechanism for storing passwords (#i42)
      -

      1.xxiv. Changes since 3.0.RC4

      +

      1.xxv. Changes since 3.0.RC4

      • [Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)
        • @@ -3418,7 +3421,7 @@
      • [Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)
      -

      1.xxv. Changes since 3.0.RC3

      +

      1.xxvi. Changes since 3.0.RC3

      • [Fix] Fixing some subsilver2 and prosilver style issues
        • @@ -3527,7 +3530,7 @@
      -

      1.xxvi. Changes since 3.0.RC2

      +

      1.xxvii. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -3573,7 +3576,7 @@
      -

      1.xxvii. Changes since 3.0.RC1

      +

      1.xxviii. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • From f9c6297a0960ff258d6caaa8a4d151ec1bce2137 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 30 May 2014 16:33:19 +0200 Subject: [PATCH 4/5] [prep-release-3.1.0-b4] Add changelog for 3.1.0-b4 --- phpBB/docs/CHANGELOG.html | 105 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 070b478e35..ab3a42206e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -95,6 +95,111 @@

        1.i. Changes since 3.1.0-b3

        +

        Bug

        +
          +
        • [PHPBB3-10176] - Imageset Appearance Problem with Google Chrome Browser.
          • +
        • [PHPBB3-11226] - filespec::move_file() from functions_upload.php does not error correctly
          • +
        • [PHPBB3-11232] - prosilver ajax.js does not respect PHPBB_USE_BOARD_URL_PATH
          • +
        • [PHPBB3-11366] - Add "MOD Version Check" for extensions to the core
          • +
        • [PHPBB3-11497] - The extension finder keeps state, so should be instantiated on each container request, not reset manually
          • +
        • [PHPBB3-12025] - Post Preview no longer shows UNAUTHORISED_BBCODE warning for disallowed BBcodes
          • +
        • [PHPBB3-12074] - Enabling/Disabling/Data deleting of an extension should generate a log entry
          • +
        • [PHPBB3-12174] - "Download all attachments" link displayed when the topic has attachments in hidden posts only
          • +
        • [PHPBB3-12185] - Topic header in viewforum too small for translation
          • +
        • [PHPBB3-12270] - Approving a topic triggers wrong notification
          • +
        • [PHPBB3-12275] - core.modify_username_string is not triggered everytime
          • +
        • [PHPBB3-12332] - Attachments with long file names break the Uploader layout
          • +
        • [PHPBB3-12357] - generate_smilies() does not work for routes
          • +
        • [PHPBB3-12402] - CAPTCHA plugin migration fails to detect missing plugins
          • +
        • [PHPBB3-12415] - Use private message instead of "pm" accronym in cpf visibility options
          • +
        • [PHPBB3-12421] - We try to display attachments in feed even for users who don't have the right to see them
          • +
        • [PHPBB3-12428] - Incorrect from version in database update log entry
          • +
        • [PHPBB3-12434] - No error message with Plupload except for files without extension
          • +
        • [PHPBB3-12435] - purge_notifications() fails for disabled extensions
          • +
        • [PHPBB3-12440] - Change URL in browsers addressbar when a view=unread#unread link was used
          • +
        • [PHPBB3-12451] - posting.php TOO_FEW_CHARS_LIMIT should be split for plurals
          • +
        • [PHPBB3-12459] - Unapproved posts/topics are not correctly handled in feeds
          • +
        • [PHPBB3-12460] - Soft deleted posts/topics are not correctly handled in feeds
          • +
        • [PHPBB3-12461] - Statistics are wrong for topic's based feeds
          • +
        • [PHPBB3-12476] - purge_cache should increase asset version
          • +
        • [PHPBB3-12486] - "Risky" tests from phpunit 4.1
          • +
        • [PHPBB3-12491] - Conflict between USERNAME_FULL in functions.php and mcp_notes.php
          • +
        • [PHPBB3-12493] - User can not send PMs to users with PMs disabled, but PM button is visible on posts
          • +
        • [PHPBB3-12498] - IE8 displays avatar in header with wrong width
          • +
        • [PHPBB3-12499] - Incorrect call to phpbb\log\log::add() in db:migrate console command
          • +
        • [PHPBB3-12500] - user.img does not set a title attribute for resulting span
          • +
        • [PHPBB3-12501] - Weird post attachment behavior in MCP report details
          • +
        • [PHPBB3-12503] - All test cases should extend phpbb_test_case instead of PHPUnit_Framework_TestCase
          • +
        • [PHPBB3-12504] - Avatar manager test is using undefined variables
          • +
        • [PHPBB3-12509] - Extentions can't send email with new notification system
          • +
        • [PHPBB3-12510] - build_url() is not encoding url entities
          • +
        • [PHPBB3-12511] - Missing language strings in memberlist group view for mobile prosilver
          • +
        • [PHPBB3-12513] - simple_headers do not support extension loaded CSS stylesheets
          • +
        • [PHPBB3-12517] - Missing argument in call to log.add() in prune_shadow_topics.php
          • +
        • [PHPBB3-12519] - m_approve language update from soft delete patch got nucked by a merge conflict
          • +
        • [PHPBB3-12520] - Can not move text with the mouse anymore in post-box when attachments are allowed
          • +
        • [PHPBB3-12522] - Add parameter description in guesser_interface
          • +
        • [PHPBB3-12525] - CONTACT_USER used with username
          • +
        • [PHPBB3-12526] - "Undefined index: filesize" error thrown when editing a PM with attachments
          • +
        • [PHPBB3-12527] - Remove translation editor from ACP
          • +
        • [PHPBB3-12529] - phpbb\controller\resolver::getController doesn't use $phpbb_root_path to check if the template dir exist
          • +
        • [PHPBB3-12533] - The notification link should fill the parent li-container in the notifications dialog
          • +
        • [PHPBB3-12534] - Enabling and disabling extensions should not abuse the red errorbox
          • +
        • [PHPBB3-12536] - Get Versions Should Not Require Both Stable and Unstable Branches
          • +
        • [PHPBB3-12540] - WRONG_FILESIZE contains broken placeholders
          • +
        • [PHPBB3-12543] - Enter key no longer works in posting when attachment error is triggered
          • +
        • [PHPBB3-12547] - Rename jquery.js to jquery.min.js in assets directory
          • +
        • [PHPBB3-12548] - [RTL] - Posting button icons should display on left side of text
          • +
        • [PHPBB3-12549] - [RTL] - Forumlist/topiclist <dfn> tags should not be visible
          • +
        • [PHPBB3-12550] - [RTL] - Last post column breaks into second line
          • +
        • [PHPBB3-12551] - [RTL] - Breadcrumb separator does not display correctly
          • +
        • [PHPBB3-12561] - Create_schema_files.php should process colum "after" instead of adding it to the JSON
          • +
        • [PHPBB3-12570] - db_text throws an error, when set() is called with the current value
          • +
        • [PHPBB3-12572] - JavaScript console throws error when alert message title is not defined (core.js bug)
          • +
        • [PHPBB3-12580] - :link Pseudo causing over specificity issues in the theme
          • +
        • [PHPBB3-12586] - \phpbb\extension\manager::all_available() should only locate ext files two levels deep and ignore dot-files/folders
          • +
        • [PHPBB3-12594] - File headers, credit lines, etc. should reflect updated legal info
          • +
        • [PHPBB3-12600] - The cli command extension:show is broken
          • +
        • [PHPBB3-12604] - Notifications Dropdown Padding Broken When Empty
          • +
        • [PHPBB3-12611] - phpBB Group copyright notice should be removed from all images
          • +
        • [PHPBB3-12614] - Do not hide post buttons before hovering over post
          • +
        • [PHPBB3-12621] - schema.json is not up to date with migration files
          • +
        +

        Improvement

        +
          +
        • [PHPBB3-9388] - use DOM scripting to hide unnecessary input fields
          • +
        • [PHPBB3-11163] - Include ext/ directory in installation and update packages
          • +
        • [PHPBB3-12155] - Use CSS instead of translated images for the mini post buttons
          • +
        • [PHPBB3-12407] - Allow changing of post_data and other variables with core.posting_modify_template_vars
          • +
        • [PHPBB3-12431] - Add has_poll icon to topiclists
          • +
        • [PHPBB3-12433] - QUOTE_DEPTH_EXCEEDED needs a different string for '1'
          • +
        • [PHPBB3-12488] - Add user warning indication to viewtopic posts
          • +
        • [PHPBB3-12507] - Add console command to purge the cache
          • +
        • [PHPBB3-12518] - Allow extensions to overwrite CANNOT_EDIT_* checks in posting.php and viewtopic.php
          • +
        • [PHPBB3-12523] - Add search_results.html template events search_results_topic_(before/after)
          • +
        • [PHPBB3-12524] - Add search.php core event to modify search results rowset
          • +
        • [PHPBB3-12531] - Restore default topic title links in subsilver2
          • +
        • [PHPBB3-12555] - Make use of canonical urls to avoid duplicate content
          • +
        • [PHPBB3-12583] - Add event core.mcp_warn_post_before/after
          • +
        • [PHPBB3-12584] - Add event core.mcp_warn_user_before/after
          • +
        +

        Sub-task

        + +

        Task

        +
          +
        • [PHPBB3-10839] - Remove phpunit.xml.functional and always include functional tests
          • +
        • [PHPBB3-12384] - Run Travis CI HHVM tests against MySQLi instead of MySQL
          • +
        • [PHPBB3-12495] - Add Sami to composer dependencies and build script
          • +
        • [PHPBB3-12544] - Update Plupload to 2.1.2
          • +
        • [PHPBB3-12582] - Strip away copyrighted ICC profile from images
          • +
        • [PHPBB3-12592] - Run mysql driver on Travis CI
          • +
        • [PHPBB3-12603] - Remove hook_system.html from docs
          • +
        + +

        1.ii. Changes since 3.1.0-b2

        Bug

        From da48b7df22cbca1cfcbe558851dcc52c096b5edc Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 30 May 2014 17:52:38 +0200 Subject: [PATCH 5/5] [prep-release-3.1.0-b4] Update phpBB Version for b5 development --- build/build.xml | 6 +++--- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index dcc8159c60..ec94cf3ea6 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 7b2a41048b..cf18cafe90 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.1.0-b4'); +define('PHPBB_VERSION', '3.1.0-b5-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 4a23724f40..e335c1f9ba 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -272,7 +272,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.1.0-b4'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-b5-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');