diff --git a/build/build.xml b/build/build.xml index 2985218e7b..0d551e606b 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b1db7b6f36..85828d91f8 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -49,6 +49,7 @@
  1. Changelog
      +
    • Changes since 3.1.x
    • Changes since 3.1.5
    • Changes since 3.1.4
    • Changes since 3.1.3
      • @@ -113,6 +114,243 @@
      +

      Changes since 3.1.x

      +

      Bug

      +
        +
      • [PHPBB3-6466] - Permission Role Tooltips do not display in Safari
        • +
      • [PHPBB3-7187] - Quote smilies error
        • +
      • [PHPBB3-7275] - Custom bbodes trim('${1}')
        • +
      • [PHPBB3-8064] - forum author sort not using username_clean
        • +
      • [PHPBB3-8419] - custom tag eats up space character
        • +
      • [PHPBB3-8420] - emoticon removes space before itself when using preview
        • +
      • [PHPBB3-8613] - BBCode_uid- and censor-bug
        • +
      • [PHPBB3-9073] - Word censoring in URLs
        • +
      • [PHPBB3-9109] - Maximum allowed recepients restriction precedence
        • +
      • [PHPBB3-9377] - Custom BB Code Nesting
        • +
      • [PHPBB3-10002] - (incomplete) BBCode usage of [quote] - and [list] - forces closing [/list] - and [/quote] -s, ultimately breaking HTML/Design
        • +
      • [PHPBB3-10388] - Template engine should use json_encode() to properly escape JS properties
        • +
      • [PHPBB3-10572] - Unguarded includes in acp/
        • +
      • [PHPBB3-10989] - Bug in BBCode
        • +
      • [PHPBB3-11444] - Unnecessary notify column in phpbb_user_notifications table
        • +
      • [PHPBB3-11967] - Notification settings are not respected
        • +
      • [PHPBB3-12143] - Untranslated group name from index if not special group
        • +
      • [PHPBB3-12195] - Double-slash URLs not supported
        • +
      • [PHPBB3-12387] - mysqli_free_result is called with false value
        • +
      • [PHPBB3-12554] - Quotes do not display correctly as list elements
        • +
      • [PHPBB3-12698] - Replace all instances of magic numbers with constants in javascript
        • +
      • [PHPBB3-12957] - The template engine is not constructed properly in install/index
        • +
      • [PHPBB3-12974] - Update nightly version of develop to 3.2.0-a1-dev
        • +
      • [PHPBB3-13101] - Remove WLM contact from profile
        • +
      • [PHPBB3-13238] - \phpbb\db\migration\data\v310\mysql_fulltext_drop tries to drop non existent indexes
        • +
      • [PHPBB3-13359] - Develop tests fail due to wrong template set up in tests
        • +
      • [PHPBB3-13362] - The whole cache dir (excluding the .htaccess and index.html files) should be ignored by git
        • +
      • [PHPBB3-13371] - Lang vars not loaded during install process
        • +
      • [PHPBB3-13372] - Environment Bug - Routing broken for extensions
        • +
      • [PHPBB3-13377] - Function decode_message() incorrectly decodes www type URLs
        • +
      • [PHPBB3-13425] - Smiley code at start of text being quoted doesn't show smiley image in quote
        • +
      • [PHPBB3-13513] - Mixed routing file paths in the router
        • +
      • [PHPBB3-13555] - Poll options preview rendered incorrectly by <br /> collision
        • +
      • [PHPBB3-13619] - Remove unneeded folders/files from vendor folder in release package
        • +
      • [PHPBB3-13638] - INCLUDECSS and INCLUDEJS Broken in 3.2
        • +
      • [PHPBB3-13670] - Fix fatal function name must be a string in functional tests
        • +
      • [PHPBB3-13680] - Notification for a quote within a quote
        • +
      • [PHPBB3-13718] - Spambot countermeasures/CAPTCHA admin panel won't load
        • +
      • [PHPBB3-13749] - Add missing slash to base uri in helper route tests
        • +
      • [PHPBB3-13766] - Missing style_parent_id in textformater's data_access::get_styles()
        • +
      • [PHPBB3-13769] - bin/phpbbcli.php ignores PHPBB_ENVIRONMENT constant from config.php
        • +
      • [PHPBB3-13772] - Error in @param variable type for phpbb\passwords\manager
        • +
      • [PHPBB3-13782] - ACM null caching driver class is named with the reserved word 'null'
        • +
      • [PHPBB3-13792] - Travis fails installing hhvm-nigthly
        • +
      • [PHPBB3-13814] - phpbb_is_writable() method of the new filesystem class truncates files
        • +
      • [PHPBB3-13825] - create_thumbnail() incorrectly calls phpbb\filesystem::phpbb_chmod
        • +
      • [PHPBB3-13828] - Rename null driver to dummy for PHP7 compatibility in tests
        • +
      • [PHPBB3-13829] - Router requires cache directory to be writable
        • +
      • [PHPBB3-13839] - Failing test when the phpBB root directory isn't named phpbb
        • +
      • [PHPBB3-13849] - Development environment broken
        • +
      • [PHPBB3-13860] - Array to string conversion in parser service
        • +
      • [PHPBB3-13871] - Call to a member function realpath() on a non-object in functions.php on line 3474
        • +
      • [PHPBB3-13875] - Lint test should ignore cache, ext, and store folder
        • +
      • [PHPBB3-13890] - Failling tests in master
        • +
      • [PHPBB3-13896] - Coding style issue in master
        • +
      • [PHPBB3-13897] - Non-existent environment causes fatal error
        • +
      • [PHPBB3-13906] - BBCodes in signatures are not correctly parsed in post preview
        • +
      • [PHPBB3-13990] - Reparse markup inside of forum rules/description
        • +
      • [PHPBB3-13993] - Signature Editing Broken
        • +
      • [PHPBB3-14008] - Do not add a user_id value to quotes from guests
        • +
      • [PHPBB3-14033] - Correct docblock errors
        • +
      • [PHPBB3-14034] - Fix reparser names that contain "text_reparser" in the middle
        • +
      • [PHPBB3-14036] - Replace path_helper with a mock
        • +
      • [PHPBB3-14052] - New installer - The commands are not translated
        • +
      • [PHPBB3-14074] - Not possible to clear notification (mark as read)
        • +
      • [PHPBB3-14076] - Notifications settings are not correctly handled when a non default setting is set
        • +
      • [PHPBB3-14078] - Notification related sql general error on submission of editing post
        • +
      • [PHPBB3-14079] - Cannot mark notification as read from the dropdown
        • +
      • [PHPBB3-14094] - Current master branch is getting segmentation fault error on PHP 7 tests
        • +
      • [PHPBB3-14128] - Image posting overflow regression
        • +
      • [PHPBB3-14137] - Fix Notification Menu Settings spacing issue caused by new jump-box improvements
        • +
      • [PHPBB3-14138] - Use span tags instead of abbr tags in the footer
        • +
      • [PHPBB3-14165] - Fix layout of ucp/mcp after 14139
        • +
      • [PHPBB3-14178] - Installer database helper tests fail if sqlite3 is not present
        • +
      • [PHPBB3-14180] - Use unix line ending in files classes tests
        • +
      • [PHPBB3-14182] - Move the v310\notifications_board migration to v320\notifications_board
        • +
      • [PHPBB3-14183] - Remove deprecated max-device-width
        • +
      • [PHPBB3-14193] - Custom BBCode Buttons Broken
        • +
      • [PHPBB3-14194] - Responsive Quick Links Menu Broken
        • +
      • [PHPBB3-14195] - Plupload Attachments Not Quite Working
        • +
      • [PHPBB3-14199] - We need to hide icons from screen readers
        • +
      • [PHPBB3-14202] - Add missing sr-only classes to icons
        • +
      • [PHPBB3-14216] - Do not run thumbnail test if gd is not enabled
        • +
      • [PHPBB3-14221] - Fix viewforum header issue
        • +
      • [PHPBB3-14222] - ACP users page tries to cast deactivated_super_global to int
        • +
      • [PHPBB3-14225] - Inject the resolver in routing loaders when using them
        • +
      • [PHPBB3-14230] - Unread posts' icons don't have different color in viewtopic
        • +
      • [PHPBB3-14234] - Do not use references in trigger_event()
        • +
      • [PHPBB3-14235] - Font Awesome not available with simple_header.html
        • +
      • [PHPBB3-14240] - Always include all config files in the update package
        • +
      • [PHPBB3-14274] - New installer has weak inclusion of user functions
        • +
      • [PHPBB3-14277] - Don't use user_id in migrations as it is not defined
        • +
      • [PHPBB3-14278] - Don't use user_id in installer if not available
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-8672] - No file size limit in getimagesize() and remote upload
        • +
      • [PHPBB3-8708] - Splitting global announcements from f_announce
        • +
      • [PHPBB3-9485] - Please include link to specific post in moderator's activity logs.
        • +
      • [PHPBB3-10268] - extend function make_clickable() to also recognize semicolons as leading URL borders
        • +
      • [PHPBB3-10620] - Quote tag improvement
        • +
      • [PHPBB3-10922] - Allow parameters for [email] - BBCode content instead of addresses only
        • +
      • [PHPBB3-11649] - Move construction of twig environment to DIC
        • +
      • [PHPBB3-11742] - BBCode 'code' doesn't support tabs
        • +
      • [PHPBB3-12466] - Move classes from acp_database.php to their own files
        • +
      • [PHPBB3-12487] - Update PHP code
        • +
      • [PHPBB3-12608] - Improve notifications drop-down menu styling in header
        • +
      • [PHPBB3-12654] - Improve header search-box styling
        • +
      • [PHPBB3-12681] - Cache the compiled routes and dump the url_generator
        • +
      • [PHPBB3-12719] - Convert to Normalize & SUITCSS - base for reset
        • +
      • [PHPBB3-12745] - Allow Emoji characters in posts
        • +
      • [PHPBB3-12769] - Add and use Font-Awesome to handle proSilver icons
        • +
      • [PHPBB3-12821] - Use CSS instead of images for gradients
        • +
      • [PHPBB3-12958] - Remove subsilver2
        • +
      • [PHPBB3-13063] - Move functions_url_matcher to a proper class
        • +
      • [PHPBB3-13132] - Twig: move the loops content from loops. to the root context
        • +
      • [PHPBB3-13137] - Remove schema.json from repository
        • +
      • [PHPBB3-13178] - Allow posting Emoji characters if the database supports it
        • +
      • [PHPBB3-13206] - DEBUG mode should automatically recompile stale style components
        • +
      • [PHPBB3-13266] - Enabling twig dump function if DEBUG is defined
        • +
      • [PHPBB3-13388] - Integrate routing and di parameters resolution
        • +
      • [PHPBB3-13450] - Type-hint return value of $phpbb_container->get()
        • +
      • [PHPBB3-13455] - Change request_var() calls with $request->variable()
        • +
      • [PHPBB3-13468] - Change add_log() calls with $phpbb_log->add()
        • +
      • [PHPBB3-13494] - Replace set_config() calls with $config->set()
        • +
      • [PHPBB3-13496] - Replace set_config_count() calls with $config->increment()
        • +
      • [PHPBB3-13497] - Change get_tables() calls with $db_tools->sql_list_tables()
        • +
      • [PHPBB3-13498] - Change get_user_avatar() calls with phpbb_get_avatar()
        • +
      • [PHPBB3-13499] - Move get_remote_file() to functions_compatibility.php
        • +
      • [PHPBB3-13595] - Remove unused instances of the bbcode class
        • +
      • [PHPBB3-13614] - Remove phpbb_pcre_utf8_support() and assume Unicode is supported by PCRE
        • +
      • [PHPBB3-13652] - Extend SQL query builder functionality
        • +
      • [PHPBB3-13697] - Rewriting/moving file system functions to filesystem class
        • +
      • [PHPBB3-13740] - Refactoring installer
        • +
      • [PHPBB3-13762] - Moving translation loading and language related functions into a service
        • +
      • [PHPBB3-13770] - Make DI Container builder constructor dependency free
        • +
      • [PHPBB3-13789] - Implement Googles noCAPTCHA reCAPTCHA
        • +
      • [PHPBB3-13801] - Decouple the user object from the text_formatter.s9e.parser service
        • +
      • [PHPBB3-13803] - Implement a generic and scalable way to reparse rich text
        • +
      • [PHPBB3-13805] - Make generate_text_for_storage() match the signature and feature set of message_parser::parse()
        • +
      • [PHPBB3-13844] - Replace help_ language magic with a help manager and normal language files
        • +
      • [PHPBB3-13847] - Move quote generation to text_formatter.utils
        • +
      • [PHPBB3-13891] - Add CLI commands for reparsing text
        • +
      • [PHPBB3-13901] - Give quotes more whitespace in the posting form for readability
        • +
      • [PHPBB3-13902] - Increase the CSS margin around blockquote
        • +
      • [PHPBB3-13904] - Refactor attachment upload functions into service
        • +
      • [PHPBB3-13921] - Try harder to fix block elements BBCodes used inside of inline elements BBCodes
        • +
      • [PHPBB3-13946] - Increase the CSS margin around [code] - and [list] -
        • +
      • [PHPBB3-13970] - Save the value of the optional parameter in [code] - BBCode
        • +
      • [PHPBB3-13986] - Add --resume option to reparser CLI
        • +
      • [PHPBB3-13987] - Add --dry-run option to reparser CLI
        • +
      • [PHPBB3-14000] - Make it possible to use emojis in posts
        • +
      • [PHPBB3-14097] - Catch and show all exceptions
        • +
      • [PHPBB3-14107] - dropdown rendering on rtl
        • +
      • [PHPBB3-14124] - Automatically translate exception in CLI
        • +
      • [PHPBB3-14139] - stop styling IDs
        • +
      • [PHPBB3-14157] - Allow administrators to set an alt attribute for topic icons
        • +
      • [PHPBB3-14162] - Add CLI commands to manage migrations
        • +
      • [PHPBB3-14168] - Refactor attachment management functions into classes
        • +
      • [PHPBB3-14174] - issues in language\en\install_new.php
        • +
      • [PHPBB3-14175] - Refactor responsive implementation for easier manipulation
        • +
      • [PHPBB3-14206] - Fix jumpbox incosistencies
        • +
      • [PHPBB3-14220] - Adding routing file locator and route loader services
        • +
      • [PHPBB3-14231] - Fix double home icon in breadcrumbs
        • +
      • [PHPBB3-14237] - Use language class in the notifications component
        • +
      • [PHPBB3-14264] - Don't use constants in textreparser plugins
        • +
      +

      New Feature

      +
        +
      • [PHPBB3-10165] - Send test email feature on email settings ACP page
        • +
      • [PHPBB3-11768] - Integrate s9e\TextFormatter
        • +
      • [PHPBB3-12516] - Always preview signature in UCP/ACP module
        • +
      • [PHPBB3-12620] - Allow the user to define multiples environments
        • +
      • [PHPBB3-12692] - Add a console command to manage the thumbnail
        • +
      • [PHPBB3-13329] - Rely on Intl and mbstring, use patchwork/utf8 as fallback
        • +
      • [PHPBB3-13641] - problem with custom BBCode
        • +
      • [PHPBB3-13961] - Add orderable service collections
        • +
      • [PHPBB3-14125] - Add --env option to all CLI commands
        • +
      • [PHPBB3-14158] - Add a lang_array function to the language service to avoid using call_user_func
        • +
      +

      Sub-task

      + +

      Task

      +
        +
      • [PHPBB3-9457] - [Accessibility] - Add WAI-ARIA landmarks to the Prosilver template files
        • +
      • [PHPBB3-11528] - Use mink for acceptance tests involving javascript execution
        • +
      • [PHPBB3-12384] - Run Travis CI HHVM tests against MySQLi instead of MySQL
        • +
      • [PHPBB3-12505] - Remove outdated media handling in attachment.html
        • +
      • [PHPBB3-12564] - Remove obsolete version definitions from module info files
        • +
      • [PHPBB3-12916] - Add separate nightly builds for 3.1 and 3.2
        • +
      • [PHPBB3-13130] - Update dependencies to Symfony 2.5
        • +
      • [PHPBB3-13139] - Update Twig to 1.18.0
        • +
      • [PHPBB3-13363] - Replace phpbb\php\ini with composer package bantu/ini-get-wrapper
        • +
      • [PHPBB3-13407] - Update Symfony Components to 2.7.x
        • +
      • [PHPBB3-13572] - Upgrade composer to 1.0.0-alpha9
        • +
      • [PHPBB3-13634] - Update README to show new branch names
        • +
      • [PHPBB3-13725] - Coding guidelines: static public
        • +
      • [PHPBB3-13767] - Remove .git from vendor/s9e/text-formatter
        • +
      • [PHPBB3-13768] - Update to Symfony 2.8@dev
        • +
      • [PHPBB3-13774] - Update s9e\TextFormatter
        • +
      • [PHPBB3-13777] - Move acp/modules module handling code into a service
        • +
      • [PHPBB3-13793] - Remove message translation from exceptions
        • +
      • [PHPBB3-13800] - Make extension manager an optional dependency for the router
        • +
      • [PHPBB3-13804] - Make template's user dependency optional
        • +
      • [PHPBB3-13832] - Replace use of deprecated e modifier of preg_replace in bbcode functions
        • +
      • [PHPBB3-13985] - Update s9e\TextFormatter
        • +
      • [PHPBB3-14015] - Update Symfony to the latest 2.8@dev
        • +
      • [PHPBB3-14053] - Remove @covers annotations from installer config test
        • +
      • [PHPBB3-14056] - Keep install schema resources in the install folder
        • +
      • [PHPBB3-14096] - Update Symfony to the latest 2.8@dev
        • +
      • [PHPBB3-14140] - Update Symfony to benefit from improvement to the console component
        • +
      • [PHPBB3-14150] - Update fast-image-size to newest release
        • +
      • [PHPBB3-14205] - Bump PHP requirement to 5.4
        • +
      • [PHPBB3-14238] - Update Symfony to the latest 2.8@dev
        • +
      • [PHPBB3-14243] - Exclude every .git directory from the pakages
        • +
      • [PHPBB3-14256] - Remove PHP7 from the allowed failures
        • +
      • [PHPBB3-14265] - Make all tables available in the container
        • +
      +

      Changes since 3.1.5

      Bug

      diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index f6d62fcdf4..551cf1f432 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.2.0-a1-dev'); +define('PHPBB_VERSION', '3.2.0-a1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 30ff5119ab..9949c972d9 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.1.6', + 'phpbb_version' => '3.2.0-a1', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 680341b855..f1366c9677 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -275,7 +275,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.2.0-a1-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.2.0-a1'); 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/v320/allowed_schemes_links.php b/phpBB/phpbb/db/migration/data/v320/allowed_schemes_links.php index de127e3745..726822bc71 100644 --- a/phpBB/phpbb/db/migration/data/v320/allowed_schemes_links.php +++ b/phpBB/phpbb/db/migration/data/v320/allowed_schemes_links.php @@ -15,6 +15,13 @@ namespace phpbb\db\migration\data\v320; class allowed_schemes_links extends \phpbb\db\migration\migration { + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v320\dev', + ); + } + public function update_data() { return array( diff --git a/phpBB/phpbb/db/migration/data/v320/announce_global_permission.php b/phpBB/phpbb/db/migration/data/v320/announce_global_permission.php index fe30a1c1b8..7afecb884b 100644 --- a/phpBB/phpbb/db/migration/data/v320/announce_global_permission.php +++ b/phpBB/phpbb/db/migration/data/v320/announce_global_permission.php @@ -29,7 +29,9 @@ class announce_global_permission extends \phpbb\db\migration\migration static public function depends_on() { - return array('\phpbb\db\migration\data\v310\rc2'); + return array( + '\phpbb\db\migration\data\v320\dev', + ); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v320/dev.php b/phpBB/phpbb/db/migration/data/v320/dev.php new file mode 100644 index 0000000000..ad2da3c1f4 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v320/dev.php @@ -0,0 +1,36 @@ + +* @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\v320; + +class dev extends \phpbb\db\migration\container_aware_migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.2.0-dev', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v31x\v316', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.0-dev')), + ); + } +} diff --git a/phpBB/phpbb/db/migration/data/v320/font_awesome_update.php b/phpBB/phpbb/db/migration/data/v320/font_awesome_update.php index 6ffaf18b4a..817b638037 100644 --- a/phpBB/phpbb/db/migration/data/v320/font_awesome_update.php +++ b/phpBB/phpbb/db/migration/data/v320/font_awesome_update.php @@ -15,6 +15,13 @@ namespace phpbb\db\migration\data\v320; class font_awesome_update extends \phpbb\db\migration\migration { + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v320\dev', + ); + } + public function effectively_installed() { return isset($this->config['load_font_awesome_url']); diff --git a/phpBB/phpbb/db/migration/data/v320/icons_alt.php b/phpBB/phpbb/db/migration/data/v320/icons_alt.php index 7071ae78db..80132e579e 100644 --- a/phpBB/phpbb/db/migration/data/v320/icons_alt.php +++ b/phpBB/phpbb/db/migration/data/v320/icons_alt.php @@ -17,7 +17,9 @@ class icons_alt extends \phpbb\db\migration\migration { static public function depends_on() { - return array('\phpbb\db\migration\data\v310\dev'); + return array( + '\phpbb\db\migration\data\v320\dev', + ); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/v320/log_post_id.php b/phpBB/phpbb/db/migration/data/v320/log_post_id.php index 0f155d543c..ead53c8138 100644 --- a/phpBB/phpbb/db/migration/data/v320/log_post_id.php +++ b/phpBB/phpbb/db/migration/data/v320/log_post_id.php @@ -17,7 +17,9 @@ class log_post_id extends \phpbb\db\migration\migration { static public function depends_on() { - return array('\phpbb\db\migration\data\v310\dev'); + return array( + '\phpbb\db\migration\data\v320\dev', + ); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/v320/notifications_board.php b/phpBB/phpbb/db/migration/data/v320/notifications_board.php index fd9f1a2ad6..8a76ebab58 100644 --- a/phpBB/phpbb/db/migration/data/v320/notifications_board.php +++ b/phpBB/phpbb/db/migration/data/v320/notifications_board.php @@ -17,7 +17,9 @@ class notifications_board extends \phpbb\db\migration\migration { static public function depends_on() { - return array('\phpbb\db\migration\data\v310\notifications'); + return array( + '\phpbb\db\migration\data\v320\dev', + ); } public function update_data() diff --git a/phpBB/phpbb/db/migration/data/v320/remove_outdated_media.php b/phpBB/phpbb/db/migration/data/v320/remove_outdated_media.php index 59208be4dc..c14d31f1c0 100644 --- a/phpBB/phpbb/db/migration/data/v320/remove_outdated_media.php +++ b/phpBB/phpbb/db/migration/data/v320/remove_outdated_media.php @@ -21,6 +21,13 @@ class remove_outdated_media extends \phpbb\db\migration\migration ATTACHMENT_CATEGORY_QUICKTIME, ); + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v320\dev', + ); + } + public function update_data() { return array( diff --git a/phpBB/phpbb/db/migration/data/v320/remove_profilefield_wlm.php b/phpBB/phpbb/db/migration/data/v320/remove_profilefield_wlm.php index 2898c708f8..1cb9070bf9 100644 --- a/phpBB/phpbb/db/migration/data/v320/remove_profilefield_wlm.php +++ b/phpBB/phpbb/db/migration/data/v320/remove_profilefield_wlm.php @@ -17,7 +17,9 @@ class remove_profilefield_wlm extends \phpbb\db\migration\migration { static public function depends_on() { - return array('\phpbb\db\migration\data\v310\profilefield_wlm'); + return array( + '\phpbb\db\migration\data\v320\dev', + ); } public function update_schema() diff --git a/phpBB/phpbb/db/migration/data/v320/v320a1.php b/phpBB/phpbb/db/migration/data/v320/v320a1.php new file mode 100644 index 0000000000..d7ecb36f90 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v320/v320a1.php @@ -0,0 +1,44 @@ + +* @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\v320; + +class v320a1 extends \phpbb\db\migration\container_aware_migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.2.0-a1', '>='); + } + + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v320\dev', + '\phpbb\db\migration\data\v320\allowed_schemes_links', + '\phpbb\db\migration\data\v320\announce_global_permission', + '\phpbb\db\migration\data\v320\remove_profilefield_wlm', + '\phpbb\db\migration\data\v320\font_awesome_update', + '\phpbb\db\migration\data\v320\icons_alt', + '\phpbb\db\migration\data\v320\log_post_id', + '\phpbb\db\migration\data\v320\remove_outdated_media', + '\phpbb\db\migration\data\v320\notifications_board', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.2.0-dev')), + ); + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 481b80d912..33547c3ce5 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.2.0-a1-dev -phpbb_version = 3.2.0-a1-dev +style_version = 3.2.0-a1 +phpbb_version = 3.2.0-a1 # Defining a different template bitfield # template_bitfield = lNg=