diff --git a/build/build.xml b/build/build.xml index c1f81fb947..01fb48a383 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 8499431f83..b1e85131f2 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog
      +
    1. Changes since 3.1.0-b2
    2. Changes since 3.1.0-b1
    3. Changes since 3.1.0-a3
    4. Changes since 3.1.0-a2
      5. @@ -91,7 +92,172 @@
      -

      1.i. Changes since 3.1.0-b1

      +

      1.i. Changes since 3.1.0-b2

      + +

      Bug

      +
        +
      • [PHPBB3-7707] - Missing occurrences of get_username_string
        • +
      • [PHPBB3-8323] - Banned User (PMs and Mails)
        • +
      • [PHPBB3-8558] - Board Emails not setting a correct email header
        • +
      • [PHPBB3-8700] - Language file "acp/styles.php" contains many unused language entries
        • +
      • [PHPBB3-8960] - Allow changing allow_avatar_remote when images/avatars/upload is not writable
        • +
      • [PHPBB3-10423] - Searching for the term "test *" will highlight nearly every word and displays htmlspecialchars as htmlentities.
        • +
      • [PHPBB3-10687] - UNABLE_GET_IMAGE_SIZE text misleading for remote avatars
        • +
      • [PHPBB3-10851] - HTML files containing certain tags being rejected as possible attack vectors with "Check attachment file" set to "No"
        • +
      • [PHPBB3-11098] - New persistent login keys list should have (un)select all and order options.
        • +
      • [PHPBB3-11339] - Using AJAX calls one after another
        • +
      • [PHPBB3-11352] - Disapproving topic takes you to quick reply for that topic
        • +
      • [PHPBB3-11431] - All topic notifications are deleted if one reply is edited and needs to be approved
        • +
      • [PHPBB3-11508] - General error "not allowed as quickmod" when changing the forum while merging two topics
        • +
      • [PHPBB3-11772] - New topic notification triggered when editing an existing post with post-approval enabled
        • +
      • [PHPBB3-11860] - .htaccess not working for Apache 2.4
        • +
      • [PHPBB3-11881] - Timezone migration can take a long time
        • +
      • [PHPBB3-11917] - "Manage external account" shows when not activated
        • +
      • [PHPBB3-11978] - Text field for topic-search
        • +
      • [PHPBB3-12004] - Support empty routes to app.php/ in path_helper
        • +
      • [PHPBB3-12012] - DB Tools should correctly remove columns that are part of indexes
        • +
      • [PHPBB3-12043] - Sort Extensions by Name in ACP Ext Mgr
        • +
      • [PHPBB3-12052] - Post edited by user on moderation queue is not marked as unapproved.
        • +
      • [PHPBB3-12083] - "Select all" selects nothing in Webkit Browsers with only one character in [code] -
        • +
      • [PHPBB3-12097] - The validate_data() function doesn't work with class method
        • +
      • [PHPBB3-12113] - Deleting warnings does not use plurals correctly
        • +
      • [PHPBB3-12121] - Update process doesn't preserve total redirects for links
        • +
      • [PHPBB3-12130] - Bullet character disappears on mouse-over in IE8
        • +
      • [PHPBB3-12186] - MCP should open "Reported posts" instead of PM Reports
        • +
      • [PHPBB3-12191] - UCP should open with global settings instead of notification settings
        • +
      • [PHPBB3-12193] - Broken HTML when an SQL error occurs during migration
        • +
      • [PHPBB3-12211] - Attachment file names are run through htmlspecialchars twice
        • +
      • [PHPBB3-12254] - Language switching on Registration page doesn't work for Extensions
        • +
      • [PHPBB3-12265] - Contact profile fields icons should be hidden in a dropdown
        • +
      • [PHPBB3-12286] - Fix coding guidelines
        • +
      • [PHPBB3-12331] - Fix DB error in update_profile_field_data() with disabled fields
        • +
      • [PHPBB3-12342] - Javascript Bugs and Fixes
        • +
      • [PHPBB3-12348] - Make create_schema_files.php runnable when phpBB is not installed yet
        • +
      • [PHPBB3-12350] - tests/extension/modules_test.php can not be run alone
        • +
      • [PHPBB3-12351] - Ajax "Mark topics read" does not give feedback
        • +
      • [PHPBB3-12353] - User attachments in ACP are not displaying every attachment
        • +
      • [PHPBB3-12354] - passwords_manager_test::test_unique_id fails from time to time
        • +
      • [PHPBB3-12355] - Topic Tools not updated fully updated when subscribing/bookmarking
        • +
      • [PHPBB3-12356] - Plupload does not load in PM editor
        • +
      • [PHPBB3-12358] - data-refresh not working as expected for routes
        • +
      • [PHPBB3-12359] - Day and Month of Birthday Misaligned When Editing
        • +
      • [PHPBB3-12360] - User is displayed twice in online list after second login
        • +
      • [PHPBB3-12362] - Infinite loop in schema generator if dependency can't be resolved
        • +
      • [PHPBB3-12367] - Travis fails in phpbb_wrapper_gmgetdate_test::test_gmgetdate()
        • +
      • [PHPBB3-12372] - dE() function does not toggle in ACP
        • +
      • [PHPBB3-12373] - Add to/from forum ids to LOG_MOVE entries
        • +
      • [PHPBB3-12375] - Attachment deletion broken after jQuery update
        • +
      • [PHPBB3-12378] - Prosilver common.css has duplicate entries
        • +
      • [PHPBB3-12379] - Plupload labels duplicated when responsive
        • +
      • [PHPBB3-12380] - “Remember Me” login keys are not sorted in UCP
        • +
      • [PHPBB3-12381] - Broken error message when selecting invalid DB driver
        • +
      • [PHPBB3-12382] - Template event listners can not access subloops when loop is defined in the original file
        • +
      • [PHPBB3-12386] - Add DEBUG_EXTRA again and use it for container creation
        • +
      • [PHPBB3-12388] - Log entries without log_data display language key instead of translated string
        • +
      • [PHPBB3-12391] - core.posting_modify_template_vars pass some variables to listeners
        • +
      • [PHPBB3-12395] - Pagination tests fail on travis with postgresql
        • +
      • [PHPBB3-12397] - db_tools::sql_unique_index_exists() has wrong doc block
        • +
      • [PHPBB3-12398] - Prune shadow topics tests fail due to wrong forum_last_post_id
        • +
      • [PHPBB3-12405] - create_user() in functional tests uses invalid timezone and no dateformat
        • +
      • [PHPBB3-12406] - Fix description of page_title var in core.viewtopic_modify_page_title
        • +
      • [PHPBB3-12412] - Styling issue with pagination numbering for smilies and icons
        • +
      • [PHPBB3-12413] - Fatal error "Call to undefined method phpbb\feed\*::fetch_attachments()" for topic based feeds
        • +
      • [PHPBB3-12418] - Notice displayed for feed.php
        • +
      • [PHPBB3-12422] - Log searches error due to plural arrays in language files
        • +
      • [PHPBB3-12429] - Update phpunit to 3.8+
        • +
      • [PHPBB3-12432] - Migrator should not automatically revert custom functions defined in update_data()
        • +
      • [PHPBB3-12436] - Functional test framework's add_style() should not use sql_multi_insert()
        • +
      • [PHPBB3-12444] - The logs message aren't filled correctly when some values are missing.
        • +
      • [PHPBB3-12455] - Remove unused strings EXTENSION_CONTROLLER_MISSING and EXTENSION_CLASS_WRONG_TYPE from common.php
        • +
      • [PHPBB3-12456] - Missing new lines at the end of file in language files
        • +
      • [PHPBB3-12467] - Add config_*.php and tests_config_*.php to .gitignore
        • +
      • [PHPBB3-12469] - Convert Timezone test fails because of outdated schema
        • +
      • [PHPBB3-12470] - Move commands from .travis.yml to separate files to allow reuse
        • +
      • [PHPBB3-12472] - Set fast finish for .travis.yml
        • +
      • [PHPBB3-12474] - The console command for updating/migrating the db should display the error with the <error> tag
        • +
      • [PHPBB3-12475] - Undefined variable $log in db:migrate console command
        • +
      • [PHPBB3-12477] - PM link no longer displays in viewtopic
        • +
      • [PHPBB3-12478] - ucp_pm_viewmessage_contact_fields_before/after missing in PM page
        • +
      • [PHPBB3-12480] - \phpbb\extension\finder is finding too many routing files
        • +
      • [PHPBB3-12482] - Undefined variable: data in viewtopic when not logged in
        • +
      • [PHPBB3-12485] - Broken tests due to absolute exclude
        • +
      • [PHPBB3-12494] - Undefined index: user_type on viewtopic.php
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-9758] - Make users avatar available to the template
        • +
      • [PHPBB3-10521] - Override Board Language via URL
        • +
      • [PHPBB3-11962] - Resize images to 100% with in viewtopic
        • +
      • [PHPBB3-12150] - Automatically prune shadow topics
        • +
      • [PHPBB3-12201] - Clean up ACP attachment management page
        • +
      • [PHPBB3-12273] - Add a test to run the event exporter on travis
        • +
      • [PHPBB3-12282] - Add an interface for dbal driver to ensure that functions are there
        • +
      • [PHPBB3-12283] - Online status on posting review page.
        • +
      • [PHPBB3-12322] - Add CSS classes for post-profile <dd> elements
        • +
      • [PHPBB3-12323] - Add Template Event search_results_author_prepend
        • +
      • [PHPBB3-12327] - Changing poll result-bars width from absolute % to relative
        • +
      • [PHPBB3-12328] - Add Template Event index_body_stat_blocks_after
        • +
      • [PHPBB3-12329] - Add <div> container to index blocks (online-list, birthday-list, statistics)
        • +
      • [PHPBB3-12333] - Add Template Event overall_header_page_body_before
        • +
      • [PHPBB3-12335] - Add Events to phpbb\profilefields\manager (grab & show)
        • +
      • [PHPBB3-12336] - Add functions_module.php core events to allow adjusting parameters for custom ACP, MCP, UCP modules
        • +
      • [PHPBB3-12337] - Update jQuery to version 1.11.0
        • +
      • [PHPBB3-12338] - Add Template Event overall_footer_page_body_after
        • +
      • [PHPBB3-12339] - Add Event core.page_header_after
        • +
      • [PHPBB3-12344] - Add event to submit_pm()
        • +
      • [PHPBB3-12345] - Improve search flood interval message
        • +
      • [PHPBB3-12346] - Add Template Event overall_header_navlink_append/prepend
        • +
      • [PHPBB3-12347] - Move breadcrumb seperator from template to CSS
        • +
      • [PHPBB3-12361] - Replace the Google logo with the phpBB logo in the BBCode FAQ
        • +
      • [PHPBB3-12364] - Add template identifier var to all missing pages
        • +
      • [PHPBB3-12365] - Do not crop image attachment heights at 350px
        • +
      • [PHPBB3-12366] - Add Event core.search_get_posts_data
        • +
      • [PHPBB3-12369] - Add template variable for extensions to add classes to <body> element without JS
        • +
      • [PHPBB3-12374] - Add Template events index_body_block_<blockname>_append
        • +
      • [PHPBB3-12376] - Add template events viewtopic_body_polls
        • +
      • [PHPBB3-12377] - Move navbars to separate template files
        • +
      • [PHPBB3-12389] - Move "print topic" & "email topic" icons (and PM versions) to topic tools
        • +
      • [PHPBB3-12392] - Include $profile_fields in core.memberlist_view_profile event
        • +
      • [PHPBB3-12396] - Add Template events viewforum_forum_name_append/prepend
        • +
      • [PHPBB3-12400] - Add viewforum.php core event to allow modifying topics data before display the page
        • +
      • [PHPBB3-12401] - Add $topic_data array to core.viewtopic_modify_post_row event in viewtopic.php
        • +
      • [PHPBB3-12403] - Add template events to acp_users_prefs.html
        • +
      • [PHPBB3-12409] - Add acp_users.php core events to modify users preferences data
        • +
      • [PHPBB3-12410] - Add Template events search_results_post_before/after
        • +
      • [PHPBB3-12411] - Expand dispatch vars of event: core.search_modify_tpl_ary
        • +
      • [PHPBB3-12419] - Improve font size in notifications drop-down
        • +
      • [PHPBB3-12437] - Clean up redundant "clear" elements & "corners"
        • +
      • [PHPBB3-12438] - Add Template event memberlist_view_content_prepend
        • +
      • [PHPBB3-12442] - Add CSS classes to heading elements
        • +
      • [PHPBB3-12473] - Add console command for updating/migrating database
        • +
      • [PHPBB3-12484] - Template event ucp_agreement_terms_before/after
        • +
      +

      New Feature

      + +

      Sub-task

      +
        +
      • [PHPBB3-12349] - License in migrations header not linking to version 2 of GNU GPL
        • +
      • [PHPBB3-12370] - Editing a post removes topic notifications
        • +
      • [PHPBB3-12371] - Notifications are incorrectly updated when a post is deleted or moved to ModerationQueue
        • +
      +

      Task

      +
        +
      • [PHPBB3-12071] - Test suite fails if Fileinfo isn't installed
        • +
      • [PHPBB3-12199] - Move deprecated functions to functions_compatibility.php
        • +
      • [PHPBB3-12318] - Correctly setup HHVM functional tests on Travis CI
        • +
      • [PHPBB3-12320] - No longer allow Travis CI HHVM environment to fail
        • +
      • [PHPBB3-12341] - Add tests for get_username_string()
        • +
      • [PHPBB3-12390] - Released packages MUST NOT contain vendor tests or other non-library code
        • +
      • [PHPBB3-12417] - hhvm-nightly 2014.04.16~precise breaks tests
        • +
      • [PHPBB3-12423] - Increase composer minimum-stability from beta to stable
        • +
      • [PHPBB3-12424] - Update Symfony Dependencies to latest 2.3 releaes
        • +
      • [PHPBB3-12458] - Apply Squiz.WhiteSpace.SuperfluousWhitespace.* sniffs to legacy codebase
        • +
      + + +

      1.ii. Changes since 3.1.0-b1

      Bug

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

      1.ii. Changes since 3.1.0-a3

      +

      1.iii. Changes since 3.1.0-a3

      Bug

        @@ -306,7 +472,7 @@
      -

      1.iii. Changes since 3.1.0-a2

      +

      1.iv. Changes since 3.1.0-a2

      Bug

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

      1.iv. Changes since 3.1.0-a1

      +

      1.v. Changes since 3.1.0-a1

      Bug

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

      1.v. Changes since 3.0.x

      +

      1.vi. Changes since 3.0.x

      Bug

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

      1.vi. Changes since 3.0.11

      +

      1.vii. Changes since 3.0.11

      Bug

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

      1.vii. Changes since 3.0.10

      +

      1.viii. Changes since 3.0.10

      Bug

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

      1.viii. Changes since 3.0.9

      +

      1.ix. Changes since 3.0.9

      Bug

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

      1.ix. Changes since 3.0.8

      +

      1.x. Changes since 3.0.8

      Bug

      @@ -1955,7 +2121,7 @@ -

      1.x. Changes since 3.0.7-PL1

      +

      1.xi. Changes since 3.0.7-PL1

      Security

        @@ -2413,13 +2579,13 @@
      -

      1.xi. Changes since 3.0.7

      +

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

      +

      1.xiii. Changes since 3.0.6

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

      1.xiii. Changes since 3.0.5

      +

      1.xiv. Changes since 3.0.5

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

      1.xiv. Changes since 3.0.4

      +

      1.xv. Changes since 3.0.4

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

      1.xv. Changes since 3.0.3

      +

      1.xvi. Changes since 3.0.3

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

      1.xvi. Changes since 3.0.2

      +

      1.xvii. Changes since 3.0.2

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

      +

      1.xviii. Changes since 3.0.1

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

      1.xviii. Changes since 3.0.0

      +

      1.xix. Changes since 3.0.0

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

      1.xix. Changes since 3.0.RC8

      +

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

      1.xx. Changes since 3.0.RC7

      +

      1.xxi. Changes since 3.0.RC7

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

      1.xxi. Changes since 3.0.RC6

      +

      1.xxii. Changes since 3.0.RC6

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

      1.xxii. Changes since 3.0.RC5

      +

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

      1.xxiii. Changes since 3.0.RC4

      +

      1.xxiv. Changes since 3.0.RC4

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

      1.xxiv. Changes since 3.0.RC3

      +

      1.xxv. Changes since 3.0.RC3

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

      1.xxv. Changes since 3.0.RC2

      +

      1.xxvi. Changes since 3.0.RC2

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

      1.xxvi. Changes since 3.0.RC1

      +

      1.xxvii. Changes since 3.0.RC1

      • [Fix] (X)HTML issues within the templates (Bug #11255, #11255)
        • diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 66d2e4bd81..77cb499533 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -24,7 +24,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.1.0-b3-dev'); +define('PHPBB_VERSION', '3.1.0-b4-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 926f139da4..5f672ca092 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -33,7 +33,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-b2', + 'phpbb_version' => '3.1.0-b3', 'author' => 'phpBB Group', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 2ee6b5f806..0f9976a96b 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -271,7 +271,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-b3-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.0-b4-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'); diff --git a/phpBB/phpbb/db/migration/data/v310/beta3.php b/phpBB/phpbb/db/migration/data/v310/beta3.php new file mode 100644 index 0000000000..de4c6f7698 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v310/beta3.php @@ -0,0 +1,32 @@ +