From d8ddda512180be56100a890410dece8046aade28 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 31 May 2012 20:19:28 +0200 Subject: [PATCH 1/4] [develop-olympus] Bumping version numbers to final for 3.0.11 releases. --- phpBB/docs/INSTALL.html | 4 ++-- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/styles/prosilver/imageset/imageset.cfg | 2 +- phpBB/styles/prosilver/style.cfg | 2 +- phpBB/styles/prosilver/template/template.cfg | 2 +- phpBB/styles/prosilver/theme/theme.cfg | 2 +- phpBB/styles/subsilver2/imageset/imageset.cfg | 2 +- phpBB/styles/subsilver2/style.cfg | 2 +- phpBB/styles/subsilver2/template/template.cfg | 2 +- phpBB/styles/subsilver2/theme/theme.cfg | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 6ab118e3ee..e17f496c56 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -274,7 +274,7 @@

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 3.0.9 you should select the phpBB-3.0.9_to_3.0.10.zip/tar.gz file.

+

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 3.0.10 you should select the phpBB-3.0.10_to_3.0.11.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.

@@ -286,7 +286,7 @@

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 Automatic update package 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.9 you need the phpBB-3.0.9_to_3.0.10.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 < [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.

+

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.10 you need the phpBB-3.0.10_to_3.0.11.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 < [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 Changed files only 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.

diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 81cc2f68f3..7d6fed6164 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -32,7 +32,7 @@ unset($dbpasswd); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.0.10', + 'phpbb_version' => '3.0.11', 'author' => 'phpBB Group', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/imageset/imageset.cfg b/phpBB/styles/prosilver/imageset/imageset.cfg index 5a703d9e47..d7ba7690f6 100644 --- a/phpBB/styles/prosilver/imageset/imageset.cfg +++ b/phpBB/styles/prosilver/imageset/imageset.cfg @@ -19,7 +19,7 @@ # General Information about this style name = prosilver copyright = © phpBB Group, 2007 -version = 3.0.10 +version = 3.0.11 # Images img_site_logo = site_logo.gif*52*139 diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 95d8d287e4..97e8aced01 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -19,4 +19,4 @@ # General Information about this style name = prosilver copyright = © phpBB Group, 2007 -version = 3.0.10 \ No newline at end of file +version = 3.0.11 \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/template.cfg b/phpBB/styles/prosilver/template/template.cfg index 0b0533573a..eb3df8bfd3 100644 --- a/phpBB/styles/prosilver/template/template.cfg +++ b/phpBB/styles/prosilver/template/template.cfg @@ -19,7 +19,7 @@ # General Information about this template name = prosilver copyright = © phpBB Group, 2007 -version = 3.0.10 +version = 3.0.11 # Defining a different template bitfield template_bitfield = lNg= diff --git a/phpBB/styles/prosilver/theme/theme.cfg b/phpBB/styles/prosilver/theme/theme.cfg index e8698f7fe4..ec489d0b3d 100644 --- a/phpBB/styles/prosilver/theme/theme.cfg +++ b/phpBB/styles/prosilver/theme/theme.cfg @@ -21,7 +21,7 @@ # General Information about this theme name = prosilver copyright = © phpBB Group, 2007 -version = 3.0.10 +version = 3.0.11 # Some configuration options diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg index 75a4aad038..c943db6735 100644 --- a/phpBB/styles/subsilver2/imageset/imageset.cfg +++ b/phpBB/styles/subsilver2/imageset/imageset.cfg @@ -19,7 +19,7 @@ # General Information about this style name = subsilver2 copyright = © phpBB Group, 2003 -version = 3.0.10 +version = 3.0.11 # Images img_site_logo = site_logo.gif*94*170 diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 13e44435c6..4c40ee4438 100644 --- a/phpBB/styles/subsilver2/style.cfg +++ b/phpBB/styles/subsilver2/style.cfg @@ -19,4 +19,4 @@ # General Information about this style name = subsilver2 copyright = © 2005 phpBB Group -version = 3.0.10 +version = 3.0.11 diff --git a/phpBB/styles/subsilver2/template/template.cfg b/phpBB/styles/subsilver2/template/template.cfg index d557edba87..6568aeca08 100644 --- a/phpBB/styles/subsilver2/template/template.cfg +++ b/phpBB/styles/subsilver2/template/template.cfg @@ -19,7 +19,7 @@ # General Information about this template name = subsilver2 copyright = © phpBB Group, 2003 -version = 3.0.10 +version = 3.0.11 # Template inheritance # See http://blog.phpbb.com/2008/07/31/templating-just-got-easier/ diff --git a/phpBB/styles/subsilver2/theme/theme.cfg b/phpBB/styles/subsilver2/theme/theme.cfg index d7837a3766..5bd4480eef 100644 --- a/phpBB/styles/subsilver2/theme/theme.cfg +++ b/phpBB/styles/subsilver2/theme/theme.cfg @@ -21,7 +21,7 @@ # General Information about this theme name = subsilver2 copyright = © phpBB Group, 2003 -version = 3.0.10 +version = 3.0.11 # Some configuration options From 2011085c29d3141d66d390449b52ba6bd069ab69 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 31 May 2012 20:26:28 +0200 Subject: [PATCH 2/4] [develop-olympus] Bump version numbers for 3.0.11-RC1 release. --- build/build.xml | 6 +++--- phpBB/includes/constants.php | 2 +- phpBB/install/database_update.php | 6 +++--- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/build.xml b/build/build.xml index 3d8d3de640..c1179015eb 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 a0444ea594..5b72d89795 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -25,7 +25,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.0.11-dev'); +define('PHPBB_VERSION', '3.0.11-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index c700b483a5..c1fe144c62 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -define('UPDATES_TO_VERSION', '3.0.11-dev'); +define('UPDATES_TO_VERSION', '3.0.11-RC1'); // Enter any version to update from to test updates. The version within the db will not be updated. define('DEBUG_FROM_VERSION', false); @@ -951,7 +951,7 @@ function database_update_info() // this column was removed from the database updater // after 3.0.9-RC3 was released. It might still exist // in 3.0.9-RCX installations and has to be dropped in - // 3.0.11 after the db_tools class is capable of properly + // 3.0.12 after the db_tools class is capable of properly // removing a primary key. // 'attempt_id' => array('UINT', NULL, 'auto_increment'), 'attempt_ip' => array('VCHAR:40', ''), @@ -996,7 +996,7 @@ function database_update_info() // No changes from 3.0.10 to 3.0.11-RC1 '3.0.10' => array(), - /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.11-RC1 */ + /** @todo DROP LOGIN_ATTEMPT_TABLE.attempt_id in 3.0.12-RC1 */ ); } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index ba2d18da00..99b8f7f96d 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -246,7 +246,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 ('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.11-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.11-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'); From 19a47dfbbc4265e33c14d6679b5693d80120db4b Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 31 May 2012 20:56:40 +0200 Subject: [PATCH 3/4] [develop-olympus] Add changelog for 3.0.11 release. --- phpBB/docs/CHANGELOG.html | 155 +++++++++++++++++++++++++++++++++----- 1 file changed, 136 insertions(+), 19 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 2d3b6a6809..71e28be9bc 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -53,6 +53,7 @@
  1. Changelog
      +
    1. Changes since 3.0.10
    2. Changes since 3.0.9
    3. Changes since 3.0.8
    4. Changes since 3.0.7-PL1
      5. @@ -91,7 +92,123 @@
      -

      1.i. Changes since 3.0.9

      +

      1.i. Changes since 3.0.10

      + +

      Bug

      +
        +
      • [PHPBB3-7432] - Unclear language for Inactive Users on ACP main page
        • +
      • [PHPBB3-8652] - Duplicate Emails Sent When Subscribed to Forum and Topic
        • +
      • [PHPBB3-9079] - Display backtrace on all E_USER_ERROR errors, not only SQL errors (when DEBUG_EXTRA is enabled)
        • +
      • [PHPBB3-9084] - Unable to display 'option equal to non entered value' if dropdown CPF is not required
        • +
      • [PHPBB3-9089] - PM message title box not accessible via Tab key
        • +
      • [PHPBB3-9220] - Blue border width when table in a div
        • +
      • [PHPBB3-9681] - Password length not in security settings
        • +
      • [PHPBB3-9813] - fulltext_native.php on innodb loading deadly slow for big indexes
        • +
      • [PHPBB3-9831] - Cannot change default of Boolean checkbox custom profile field
        • +
      • [PHPBB3-10094] - Clear cache before phpBB installation
        • +
      • [PHPBB3-10129] - Missing apostrophes in ACP user management -> permissions
        • +
      • [PHPBB3-10349] - Unit tests do not remove comments from schemas
        • +
      • [PHPBB3-10399] - Special characters aren't parsed in style component variables
        • +
      • [PHPBB3-10401] - auth_ldap has an incorrect return value in login_ldap()
        • +
      • [PHPBB3-10407] - Incorrect check for empty image file paths during conversion
        • +
      • [PHPBB3-10428] - optionget/optionset functions in session.php and acp_users.php incorrectly check whether $data is at its default value
        • +
      • [PHPBB3-10456] - Subsilver2 does not define $CAPTCHA_TAB_INDEX
        • +
      • [PHPBB3-10508] - Marking forums as read displays misleading language
        • +
      • [PHPBB3-10511] - Grammar defect in permissions language
        • +
      • [PHPBB3-10512] - Test failure when no default timezone is set in php
        • +
      • [PHPBB3-10532] - Out of range $start causes a page with no search results but with pagination
        • +
      • [PHPBB3-10538] - Special character are not correctly parsed for SMTP protocol
        • +
      • [PHPBB3-10542] - Incorrect class="postlink" in styles/subsilver2/template/faq_body.html
        • +
      • [PHPBB3-10546] - Argument missing for adm_back_link() in acp_captcha.php
        • +
      • [PHPBB3-10561] - All users can choose deactivated styles.
        • +
      • [PHPBB3-10569] - template/ucp_main_front.html does not correctly handle active topic with the name "0"
        • +
      • [PHPBB3-10580] - Default tz in registration dropdown not the same as the board default tz
        • +
      • [PHPBB3-10589] - user_birthday does not use table alias in $leap_year_birthdays variable definition
        • +
      • [PHPBB3-10605] - Orpahned privmsgs are left in the prvmsgs table, with no ties in privmsgs_to table
        • +
      • [PHPBB3-10606] - $s_hidden_fields -> incorrect array name (3 files affected)
        • +
      • [PHPBB3-10611] - Add a check for selected tables existence for ACP database backup tool
        • +
      • [PHPBB3-10615] - Static calls in utf normalizer yield E_STRICT spam on php 5.4
        • +
      • [PHPBB3-10630] - Prune Users produced unnecessarily long query; Got a packet bigger than 'max_allowed_packet' bytes
        • +
      • [PHPBB3-10633] - Users are able to get the real filename of attachment
        • +
      • [PHPBB3-10639] - negative value of ranks message
        • +
      • [PHPBB3-10658] - Rank-item is not shown on team-list
        • +
      • [PHPBB3-10675] - Use more descriptive message when disk is out of space
        • +
      • [PHPBB3-10684] - Function user_notification() prevents notifications for users with stale bans
        • +
      • [PHPBB3-10689] - Bug in the popup " Find a member" when select by letter.
        • +
      • [PHPBB3-10691] - Search index creation CLI script incorrectly calculates indexing speed
        • +
      • [PHPBB3-10699] - Long h2 title breaks div.minitabs in MCP
        • +
      • [PHPBB3-10708] - After a conversion, passwords with UTF8 characters do not work when user_pass_convert is set.
        • +
      • [PHPBB3-10717] - memberlist_view.html: including admin defined profile fields doesnt work
        • +
      • [PHPBB3-10723] - Do not use SQLite on PHP 5.4 in Tests on Travis
        • +
      • [PHPBB3-10731] - JS function addquote() works incorrectly in Opera
        • +
      • [PHPBB3-10751] - MS SQL Error when searching Admin Log
        • +
      • [PHPBB3-10760] - In pre-commit git hook, syntax error is thrown, but is not specifically described
        • +
      • [PHPBB3-10767] - Git hooks do not work properly with git GUIs
        • +
      • [PHPBB3-10774] - db_tools::create_unique_index does not use specified index names on MySQL
        • +
      • [PHPBB3-10790] - Strict comparison on user_id for sending pms
        • +
      • [PHPBB3-10797] - Template var for user rank not filled
        • +
      • [PHPBB3-10835] - Misleading message in UCP when no permission to change password
        • +
      • [PHPBB3-10846] - Missing alias for MAX(post_id) in SQL query in acp_main.php
        • +
      • [PHPBB3-10849] - Missing BBCode Help Text in subsilver2
        • +
      • [PHPBB3-10858] - $db->sql_fetchfield returns false with mssqlnative
        • +
      • [PHPBB3-10860] - Side-by-side diff styling javascript bug
        • +
      • [PHPBB3-10881] - Some files use 0xA9 as the copyright symbol which is neither ASCII nor the UTF8 copyright symbol.
        • +
      • [PHPBB3-10887] - Auto increment tests depend on varbinary handling
        • +
      • [PHPBB3-10889] - Default value for c_char_size in database unit tests is an empty string instead of a char(4)
        • +
      • [PHPBB3-10890] - test_sql_fetchrow_returns_false_when_empty() fails on MSSQL and Oracle
        • +
      • [PHPBB3-10908] - No remote avatar size limit results in files limited only by PHP memory limit
        • +
      • [PHPBB3-10913] - Admin is logged out when accessing any url under adm/ without session id
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-8599] - Add "Select All" to "Add multiple smilies" screen
        • +
      • [PHPBB3-8636] - Add resync option to topic_view moderation page
        • +
      • [PHPBB3-9876] - Names and descriptions for roles "Newly registered User" in "User roles" and "Forum roles" must be different
        • +
      • [PHPBB3-9914] - Add backup warning to Automatic DB Updater
        • +
      • [PHPBB3-9916] - License in header not linking to version 2 of GNU GPL
        • +
      • [PHPBB3-10093] - Make commit-msg hook always not fatal
        • +
      • [PHPBB3-10162] - Allow TLDs over 6 characters in email addresses
        • +
      • [PHPBB3-10280] - Change the ACP user activation display
        • +
      • [PHPBB3-10308] - Disable Retain/Delete Posts selection if the user has no posts.
        • +
      • [PHPBB3-10453] - PM viewmessage page is misplacing the online icon
        • +
      • [PHPBB3-10492] - Port functional tests to develop-olympus
        • +
      • [PHPBB3-10507] - Sort installed styles list in admin control panel - styles
        • +
      • [PHPBB3-10550] - Sort not installed styles list in admin control panel - styles
        • +
      • [PHPBB3-10563] - ACP usability improvement: show deactivated styles below active styles in styles list
        • +
      • [PHPBB3-10565] - Performance: Unneeded GROUP BY in update_forum_tracking_info
        • +
      • [PHPBB3-10607] - phpBB Credit Line Hardcoded
        • +
      • [PHPBB3-10653] - Add ability to count table rows to database abstraction layer
        • +
      • [PHPBB3-10730] - Add label tags around "select" text in post splitting UI in MCP
        • +
      • [PHPBB3-10764] - FAQ mentions SourceForge
        • +
      • [PHPBB3-10812] - Installer should not display register globals UI for php 5.4+
        • +
      • [PHPBB3-10815] - Enable Feeds by default
        • +
      • [PHPBB3-10819] - Improve side-by-side diff styling
        • +
      • [PHPBB3-10834] - Backport general development language changes in readme files
        • +
      • [PHPBB3-10836] - Enable Avatars by default
        • +
      • [PHPBB3-10891] - Allow specifying test config file name via environment variable
        • +
      • [PHPBB3-10892] - Cosmetic improvements to RUNNING_TESTS.txt
        • +
      • [PHPBB3-10898] - Do not write ?> into config.php to avoid whitespace output
        • +
      +

      New Feature

      + +

      Sub-task

      +
        +
      • [PHPBB3-10907] - Mark (var)binary tests as incomplete on non-MySQL DBMSes
        • +
      +

      Task

      +
        +
      • [PHPBB3-9896] - Update links in docs/readme.html
        • +
      • [PHPBB3-10434] - Add a script that allows creating a search index from CLI
        • +
      • [PHPBB3-10455] - Remove NOTE from header files
        • +
      • [PHPBB3-10694] - Update notification in ACP (Olympus) for increase of minimum PHP version to 5.3.2
        • +
      • [PHPBB3-10718] - Add Travis CI
        • +
      • [PHPBB3-10788] - Update docs/AUTHORS for 3.0.11-RC1
        • +
      • [PHPBB3-10909] - Update Travis Test Configuration: Travis no longer supports PHP 5.3.2
        • +
      + +

      1.ii. Changes since 3.0.9

      Bug

        @@ -227,7 +344,7 @@
      • [PHPBB3-10480] - Automate changelog building
      -

      1.ii. Changes since 3.0.8

      +

      1.iii. Changes since 3.0.8

      Bug

      @@ -595,7 +712,7 @@ -

      1.iii. Changes since 3.0.7-PL1

      +

      1.iv. Changes since 3.0.7-PL1

      Security

        @@ -1053,13 +1170,13 @@
      -

      1.iiv. Changes since 3.0.7

      +

      1.iv. 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.v. Changes since 3.0.6

      +

      1.vi. Changes since 3.0.6

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

      1.vi. Changes since 3.0.5

      +

      1.vii. Changes since 3.0.5

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

      1.vii. Changes since 3.0.4

      +

      1.viii. Changes since 3.0.4

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

      1.viii. Changes since 3.0.3

      +

      1.ix. Changes since 3.0.3

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

      1.ix. Changes since 3.0.2

      +

      1.x. Changes since 3.0.2

      • [Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)
        • @@ -1605,7 +1722,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.x. Changes since 3.0.1

      +

      1.xi. Changes since 3.0.1

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

      1.xi Changes since 3.0.0

      +

      1.xii Changes since 3.0.0

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

      1.xii. Changes since 3.0.RC8

      +

      1.xiii. 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)
        • @@ -1733,7 +1850,7 @@
      • [Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)
      -

      1.xiii. Changes since 3.0.RC7

      +

      1.xiv. Changes since 3.0.RC7

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

      1.xiv. Changes since 3.0.RC6

      +

      1.xv. Changes since 3.0.RC6

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

      1.xv. Changes since 3.0.RC5

      +

      1.xvi. 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.
        • @@ -1841,7 +1958,7 @@
      • [Sec] New password hashing mechanism for storing passwords (#i42)
      -

      1.xvi. Changes since 3.0.RC4

      +

      1.xvii. Changes since 3.0.RC4

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

      1.xvii. Changes since 3.0.RC3

      +

      1.xviii. Changes since 3.0.RC3

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

      1.xviii. Changes since 3.0.RC2

      +

      1.xviv. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -2047,7 +2164,7 @@
      -

      1.xix. Changes since 3.0.RC1

      +

      1.xx. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • From 118c5d90daa783ff55319e6121c0fc77166fe58c Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 31 May 2012 22:07:34 +0200 Subject: [PATCH 4/4] [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus. --- phpBB/includes/constants.php | 2 +- phpBB/install/database_update.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 5b72d89795..17c25ee3c6 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -25,7 +25,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.0.11-RC1'); +define('PHPBB_VERSION', '3.0.12-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index c1fe144c62..a52a329f20 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -8,7 +8,7 @@ * */ -define('UPDATES_TO_VERSION', '3.0.11-RC1'); +define('UPDATES_TO_VERSION', '3.0.12-dev'); // Enter any version to update from to test updates. The version within the db will not be updated. define('DEBUG_FROM_VERSION', false); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 99b8f7f96d..b139857d28 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -246,7 +246,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 ('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.11-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.12-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');