diff --git a/build/build.xml b/build/build.xml index d65056f325..ecca324910 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 807ee95988..e2a7b15f68 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -46,6 +46,7 @@
  1. Changelog
      +
    1. Changes since 3.1.2
    2. Changes since 3.1.1
    3. Changes since 3.1.0
    4. Changes since 3.1.0-RC6
      5. @@ -103,7 +104,105 @@
      -

      1.i. Changes since 3.1.1

      +

      1.i. Changes since 3.1.2

      + +

      Security

      +
        +
      • [PHPBB3-13519] - Correctly validate imagick path as path and not string
        • +
      +

      Bug

      +
        +
      • [PHPBB3-9100] - Inline attachments are not being inserted at the cursor
        • +
      • [PHPBB3-11613] - Cookies do not work for netbios domain
        • +
      • [PHPBB3-12089] - Make HTTP status code error messages more informative
        • +
      • [PHPBB3-12642] - Custom profile field isn't displayed
        • +
      • [PHPBB3-12698] - Replace all instances of magic numbers with constants in javascript
        • +
      • [PHPBB3-12866] - Wrong profile field validation options
        • +
      • [PHPBB3-13098] - Repair Yahoo contact field
        • +
      • [PHPBB3-13192] - confirm_box() action contains app.php when enable_mod_rewrite is set
        • +
      • [PHPBB3-13238] - \phpbb\db\migration\data\v310\mysql_fulltext_drop tries to drop non existent indexes
        • +
      • [PHPBB3-13272] - Changed Files packages do not include vendor directory
        • +
      • [PHPBB3-13282] - PostgreSQL error when creating boolean/dropdown custom profile fields
        • +
      • [PHPBB3-13302] - ACP links to docs need to be updated to 3.1 URLs
        • +
      • [PHPBB3-13307] - develop/mysql_upgrader.php does not work anymore
        • +
      • [PHPBB3-13319] - Icons/smilies table improperly formed when no images present
        • +
      • [PHPBB3-13346] - Missing space in posting_editor.html
        • +
      • [PHPBB3-13357] - LOG_MOVED_TOPIC Language var missing
        • +
      • [PHPBB3-13358] - Add class for retrieving remote file data
        • +
      • [PHPBB3-13362] - The whole cache dir (excluding the .htaccess and index.html files) should be ignored by git
        • +
      • [PHPBB3-13366] - Dynamic config for "plupload_last_gc" is static
        • +
      • [PHPBB3-13381] - Code Sniffer complains about 3.1.2 migration
        • +
      • [PHPBB3-13385] - Add free result after running update query in $config->set_atomic()
        • +
      • [PHPBB3-13391] - subsilver2 poll options must have a setting of 1 when editing a post
        • +
      • [PHPBB3-13393] - Invalid parameters passed to call_user_func_array in version_helper.php
        • +
      • [PHPBB3-13396] - Multibyte chars cause attachment upload to fail
        • +
      • [PHPBB3-13400] - Add a new message for high server loads during search
        • +
      • [PHPBB3-13405] - A typo in style_update_p1.php migration may prevent updating in some circumstances
        • +
      • [PHPBB3-13406] - ADD INDEX syntax may cause an error in earlier MySQL versions
        • +
      • [PHPBB3-13420] - Prune users bug - filter all with 0 posts
        • +
      • [PHPBB3-13427] - Add template events to MCP front before/after each list
        • +
      • [PHPBB3-13431] - Wrong margin-left for RTL sites in Internet Explorer mobile view
        • +
      • [PHPBB3-13432] - Migrator module tool does not add the needed module language file
        • +
      • [PHPBB3-13441] - functions_convert fails to set global moderators default group
        • +
      • [PHPBB3-13442] - UTF-8 symbols for database host
        • +
      • [PHPBB3-13448] - \phpbb\messenger->template can't find email templates in extensions
        • +
      • [PHPBB3-13453] - Sort params in Canonical URL
        • +
      • [PHPBB3-13470] - Mass email says "user doesn't exist" when all users is selected
        • +
      • [PHPBB3-13486] - Call to undefined method phpbb\db\driver\factory::sql_escpape() on database update
        • +
      • [PHPBB3-13489] - Allow the migrations to use the DI container
        • +
      • [PHPBB3-13490] - Unicode chars are broken in edit message after preview
        • +
      • [PHPBB3-13492] - Custom BBCode URL tokens do not support IDN
        • +
      • [PHPBB3-13504] - "Array" is displayed when searching, or when unanswered posts or active topics are selected
        • +
      • [PHPBB3-13507] - Large images in posts can cause horizontal scrollbars
        • +
      • [PHPBB3-13511] - The "Unused Use" Sniff is broken
        • +
      • [PHPBB3-13530] - Fix undefined variables in migrations and tests
        • +
      • [PHPBB3-13534] - Non-existent path in attachment settings causes travis failure
        • +
      • [PHPBB3-13543] - Slow tests fail on 3.1 and 3.2
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-11033] - FULLTEXT_SPHINX_NO_CONFIG_DATA references unrequired field
        • +
      • [PHPBB3-12567] - [proSilver] - viewtopic_body.html: Change 'back2top' anchor in to '#top'
        • +
      • [PHPBB3-12926] - Support for IDN (IRI)
        • +
      • [PHPBB3-13266] - Enabling twig dump function if DEBUG is defined
        • +
      • [PHPBB3-13306] - Add error level to the error collector
        • +
      • [PHPBB3-13312] - [event] - Add core event to the mass email form
        • +
      • [PHPBB3-13368] - Add the forum_data var to the core.viewforum_get_topic_ids_data event
        • +
      • [PHPBB3-13370] - Add ability to call class methods more easily in the convertor framework
        • +
      • [PHPBB3-13389] - Replace pattern with path in routing.yml
        • +
      • [PHPBB3-13402] - Code Sniffer, unused use, check the function doc blocks
        • +
      • [PHPBB3-13409] - Add event to modify search parameters before searching
        • +
      • [PHPBB3-13419] - Add template event at the end of the file
        • +
      • [PHPBB3-13422] - Add new events in save custom cookies and set custom ban type
        • +
      • [PHPBB3-13428] - Add core events to memberlist.php for teampage
        • +
      • [PHPBB3-13430] - Add event for modifying prune SQL
        • +
      • [PHPBB3-13435] - Add core event to modify submit_post() sql data
        • +
      • [PHPBB3-13437] - [Template] - viewtopic_body_post_author_before/after
        • +
      • [PHPBB3-13439] - [event] - Add event to run code at beginning of ACP users overview
        • +
      • [PHPBB3-13440] - [event] - Add event to process when a user fails a login attempt
        • +
      • [PHPBB3-13449] - Add viewforum.php core event after the topic data has been assigned to template
        • +
      • [PHPBB3-13466] - Add bbcode_uid and bitfield to event core.message_parser_check_message
        • +
      • [PHPBB3-13478] - Add core event core.bbcode_cache_init_end
        • +
      +

      Sub-task

      +
        +
      • [PHPBB3-13141] - Add an event to allow applying additional permissions to MCP access besides f_read
        • +
      • [PHPBB3-13146] - Add an event to allow changing the result of calling get_forums_visibility_sql()
        • +
      • [PHPBB3-13147] - Add an event to change get_global_visibility_sql()'s results
        • +
      • [PHPBB3-13148] - Add an event to creating a final way to modify edit logs output
        • +
      • [PHPBB3-13154] - Add an event to edit user list for notifications
        • +
      • [PHPBB3-13158] - Add an event to allow adding extra auth checks when the user is posting
        • +
      • [PHPBB3-13159] - Add an event to allow extra auth checks when reporting posts
        • +
      • [PHPBB3-13160] - Add an event to viewtopic before viewing permissions
        • +
      +

      Task

      +
        +
      • [PHPBB3-12924] - Meta tags should be self-closing
        • +
      • [PHPBB3-13528] - Boolean checkbox profile fields display "1" instead of selected value
        • +
      + + +

      1.ii. Changes since 3.1.1

      Security

        @@ -184,7 +283,7 @@
      -

      1.ii. Changes since 3.1.0

      +

      1.iii. Changes since 3.1.0

      Security

        @@ -202,7 +301,7 @@
      • [PHPBB3-13262] - Add note to docs about htaccess file when upgrading 3.0 to 3.1
      -

      1.iii. Changes since 3.1.0-RC6

      +

      1.iv. Changes since 3.1.0-RC6

      Bug

        @@ -230,7 +329,7 @@
      • [PHPBB3-13215] - Update Symfony Components to 2.3.21
      -

      1.iv. Changes since 3.1.0-RC5

      +

      1.v. Changes since 3.1.0-RC5

      Bug

        @@ -271,7 +370,7 @@
      -

      1.v. Changes since 3.1.0-RC4

      +

      1.vi. Changes since 3.1.0-RC4

      Bug

        @@ -338,7 +437,7 @@
      • [PHPBB3-13123] - Add events to allow post blocking and post pre/past processing
      -

      1.vi. Changes since 3.1.0-RC3

      +

      1.vii. Changes since 3.1.0-RC3

      Bug

        @@ -428,7 +527,7 @@
      -

      1.vii. Changes since 3.1.0-RC2

      +

      1.viii. Changes since 3.1.0-RC2

      Bug

        @@ -552,7 +651,7 @@
      • [PHPBB3-12948] - Remove Travis CI "broken opcache on PHP 5.5.7 and 5.5.8" workaround.
      -

      1.viii. Changes since 3.1.0-RC1

      +

      1.ix. Changes since 3.1.0-RC1

      Bug

        @@ -623,7 +722,7 @@
      • [PHPBB3-12829] - Remove check for pgsql 8.3/8.2
      -

      1.ix. Changes since 3.1.0-b4

      +

      1.x. Changes since 3.1.0-b4

      Bug

        @@ -743,7 +842,7 @@
      -

      1.x. Changes since 3.1.0-b3

      +

      1.xi. Changes since 3.1.0-b3

      Bug

        @@ -850,7 +949,7 @@
      -

      1.xi. Changes since 3.1.0-b2

      +

      1.xii. Changes since 3.1.0-b2

      Bug

        @@ -1015,7 +1114,7 @@
      -

      1.xii. Changes since 3.1.0-b1

      +

      1.xiii. Changes since 3.1.0-b1

      Bug

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

      1.xiii. Changes since 3.1.0-a3

      +

      1.xiv. Changes since 3.1.0-a3

      Bug

        @@ -1230,7 +1329,7 @@
      -

      1.xiv. Changes since 3.1.0-a2

      +

      1.xv. Changes since 3.1.0-a2

      Bug

        @@ -1338,7 +1437,7 @@
      • [PHPBB3-12147] - Remove Travis CI notification configuration
      -

      1.xv. Changes since 3.1.0-a1

      +

      1.xvi. Changes since 3.1.0-a1

      Bug

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

      1.xvi. Changes since 3.0.x

      +

      1.xvii. Changes since 3.0.x

      Bug

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

      1.xvii. Changes since 3.0.12

      +

      1.xviii. Changes since 3.0.12

      Security

        @@ -2231,7 +2330,7 @@
      • [PHPBB3-13324] - Composer no longer downloads sami/sami and fabpot/goutte
      -

      1.xviii. Changes since 3.0.11

      +

      1.xix. Changes since 3.0.11

      Bug

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

      1.xix. Changes since 3.0.10

      +

      1.xx. Changes since 3.0.10

      Bug

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

      1.xx. Changes since 3.0.9

      +

      1.xxi. Changes since 3.0.9

      Bug

        @@ -2647,7 +2746,7 @@
      • [PHPBB3-10480] - Automate changelog building
      -

      1.xxi. Changes since 3.0.8

      +

      1.xxii. Changes since 3.0.8

      Bug

      @@ -3015,7 +3114,7 @@ -

      1.xxii. Changes since 3.0.7-PL1

      +

      1.xxiii. Changes since 3.0.7-PL1

      Security

      @@ -3474,13 +3573,13 @@ -

      1.xxiii. Changes since 3.0.7

      +

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

      +

      1.xxv. Changes since 3.0.6

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

      1.xxv. Changes since 3.0.5

      +

      1.xxvi. Changes since 3.0.5

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

      1.xxvi. Changes since 3.0.4

      +

      1.xxvii. Changes since 3.0.4

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

      1.xxvii. Changes since 3.0.3

      +

      1.xxviii. Changes since 3.0.3

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

      1.xxviii. Changes since 3.0.2

      +

      1.xxix. Changes since 3.0.2

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

      +

      1.xxx. Changes since 3.0.1

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

      1.xxx. Changes since 3.0.0

      +

      1.xxxi. Changes since 3.0.0

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

      1.xxxi. Changes since 3.0.RC8

      +

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

      1.xxxii. Changes since 3.0.RC7

      +

      1.xxxiii. Changes since 3.0.RC7

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

      1.xxxiii. Changes since 3.0.RC6

      +

      1.xxxiv. Changes since 3.0.RC6

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

      1.xxxiv. Changes since 3.0.RC5

      +

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

      1.xxxv. Changes since 3.0.RC4

      +

      1.xxxvi. Changes since 3.0.RC4

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

      1.xxxvi. Changes since 3.0.RC3

      +

      1.xxxvii. Changes since 3.0.RC3

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

      1.xxxvii. Changes since 3.0.RC2

      +

      1.xxxviii. Changes since 3.0.RC2

      • [Fix] Re-allow searching within the memberlist
        • @@ -4468,7 +4567,7 @@
      -

      1.xxxviii. Changes since 3.0.RC1

      +

      1.xxxix. 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 0ac9208aa4..9d86e63765 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.3-RC1-dev'); +define('PHPBB_VERSION', '3.1.3-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index da53d2c143..511f850679 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.2', + 'phpbb_version' => '3.1.3', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 7efbd3166c..4e1ff8aaf9 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -273,7 +273,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.3-RC1-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.3-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'); diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 7ee90b10ba..85ecd87c5f 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -188,10 +188,25 @@ class helper * @deprecated 3.1.3 (To be removed: 3.3.0) Use exceptions instead. */ public function error($message, $code = 500) + { + return $this->message($message, false, $code); + } + + /** + * Output a message + * + * In case of an error, please throw an exception instead + * + * @param string $message The message to display + * @param string|false $title Title for the message + * @param int $code The HTTP status code (e.g. 404, 500, 503, etc.) + * @return Response A Response instance + */ + public function message($message, $title = false, $code = 200) { $this->template->assign_vars(array( 'MESSAGE_TEXT' => $message, - 'MESSAGE_TITLE' => $this->user->lang('INFORMATION'), + 'MESSAGE_TITLE' => ($title === false) ? $this->user->lang('INFORMATION') : $title, )); return $this->render('message_body.html', $this->user->lang('INFORMATION'), $code); diff --git a/phpBB/phpbb/db/migration/data/v31x/v313rc1.php b/phpBB/phpbb/db/migration/data/v31x/v313rc1.php new file mode 100644 index 0000000000..e50754f805 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v313rc1.php @@ -0,0 +1,35 @@ + +* @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\v31x; + +class v313rc1 extends \phpbb\db\migration\migration +{ + static public function depends_on() + { + return array( + '\phpbb\db\migration\data\v30x\release_3_0_13_rc1', + '\phpbb\db\migration\data\v31x\plupload_last_gc_dynamic', + '\phpbb\db\migration\data\v31x\profilefield_remove_underscore_from_alpha', + '\phpbb\db\migration\data\v31x\profilefield_yahoo_update_url', + '\phpbb\db\migration\data\v31x\update_custom_bbcodes_with_idn', + ); + } + + public function update_data() + { + return array( + array('config.update', array('version', '3.1.3-RC1')), + ); + } +} diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 41e0d68714..34a7618f86 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.2 -phpbb_version = 3.1.2 +style_version = 3.1.3 +phpbb_version = 3.1.3 # Defining a different template bitfield # template_bitfield = lNg= diff --git a/phpBB/styles/subsilver2/style.cfg b/phpBB/styles/subsilver2/style.cfg index 6014b89e66..8f3f55ec87 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.2 -phpbb_version = 3.1.2 +style_version = 3.1.3 +phpbb_version = 3.1.3 # Defining a different template bitfield # template_bitfield = lNg=