[prep-release-3.1.3] Add changelog for 3.1.3-RC2

PHPBB3-13553

build/build.xml

@@ -2,9 +2,9 @@
 
 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.1.3-RC1" />
-	<property name="prevversion" value="3.1.2" />
-	<property name="olderversions" value="3.0.12, 3.0.13, 3.1.0-a1, 3.1.0-a2, 3.1.0-a3, 3.1.0-b1, 3.1.0-b2, 3.1.0-b3, 3.1.0-b4, 3.1.0-RC1, 3.1.0-RC2, 3.1.0-RC3, 3.1.0-RC4, 3.1.0-RC5, 3.1.0-RC6, 3.1.0, 3.1.1, 3.1.2-RC1" />
+	<property name="newversion" value="3.1.3-RC2" />
+	<property name="prevversion" value="3.1.3-RC1" />
+	<property name="olderversions" value="3.0.12, 3.0.13, 3.0.13-PL1, 3.1.0, 3.1.1, 3.1.2" />
 	<!-- no configuration should be needed beyond this point -->
 
 	<property name="oldversions" value="${olderversions}, ${prevversion}" />

phpBB/docs/CHANGELOG.html

@@ -45,7 +45,8 @@
 
 <ol>
 	<li><a href="#changelog">Changelog</a>
-	<ol style="list-style-type: lower-roman;">
+	<ul>
+		<li><a href="#v312">Changes since 3.1.3-RC1</a></li>
 		<li><a href="#v312">Changes since 3.1.2</a></li>
 		<li><a href="#v311">Changes since 3.1.1</a></li>
 		<li><a href="#v310">Changes since 3.1.0</a></li>
@@ -63,6 +64,7 @@
 		<li><a href="#v310a2">Changes since 3.1.0-a2</a></li>
 		<li><a href="#v310a1">Changes since 3.1.0-a1</a></li>
 		<li><a href="#v30x">Changes since 3.0.x</a></li>
+		<li><a href="#v3013">Changes since 3.0.13</a></li>
 		<li><a href="#v3012">Changes since 3.0.12</a></li>
 		<li><a href="#v3011">Changes since 3.0.11</a></li>
 		<li><a href="#v3010">Changes since 3.0.10</a></li>
@@ -85,7 +87,7 @@
 		<li><a href="#v30rc3">Changes since RC-3</a></li>
 		<li><a href="#v30rc2">Changes since RC-2</a></li>
 		<li><a href="#v30rc1">Changes since RC-1</a></li>
-	</ol>
+	</ul>
 	</li>
 	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
 </ol>
@@ -104,7 +106,21 @@
 
 		<div class="content">
 
-	<a name="v312"></a><h3>1.i. Changes since 3.1.2</h3>
+	<a name="v313rc1"></a><h3>Changes since 3.1.3-RC1</h3>
+
+	<h4>Bug</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12933">PHPBB3-12933</a>] - The search operator for partial matches does not work</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13544">PHPBB3-13544</a>] - Migrations' &quot;permission.permission_unset&quot; deletes all permissions instead of just the one stated</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13556">PHPBB3-13556</a>] - Translated exceptions from file_downloader are handled incorrectly</li>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13557">PHPBB3-13557</a>] - Migrations for 3.0.13 and PL1 are missing</li>
+	</ul>
+	<h4>Task</h4>
+	<ul>
+		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13553">PHPBB3-13553</a>] - Controller helper needs a message handler to replace error handler</li>
+	</ul>
+
+	<a name="v312"></a><h3>Changes since 3.1.2</h3>
 
 	<h4>Security</h4>
 	<ul>
@@ -202,7 +218,7 @@
 	</ul>
 
 
-	<a name="v311"></a><h3>1.ii. Changes since 3.1.1</h3>
+	<a name="v311"></a><h3>Changes since 3.1.1</h3>
 
 	<h4>Security</h4>
 	<ul>
@@ -283,7 +299,7 @@
 	</ul>
 
 
-	<a name="v310"></a><h3>1.iii. Changes since 3.1.0</h3>
+	<a name="v310"></a><h3>Changes since 3.1.0</h3>
 
 	<h4>Security</h4>
 	<ul>
@@ -301,7 +317,7 @@
 		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13262">PHPBB3-13262</a>] - Add note to docs about htaccess file when upgrading 3.0 to 3.1</li>
 	</ul>
 
-	<a name="v310RC6"></a><h3>1.iv. Changes since 3.1.0-RC6</h3>
+	<a name="v310RC6"></a><h3>Changes since 3.1.0-RC6</h3>
 
 	<h4>Bug</h4>
 	<ul>
@@ -329,7 +345,7 @@
 		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13215">PHPBB3-13215</a>] - Update Symfony Components to 2.3.21</li>
 	</ul>
 
-	<a name="v310RC5"></a><h3>1.v. Changes since 3.1.0-RC5</h3>
+	<a name="v310RC5"></a><h3>Changes since 3.1.0-RC5</h3>
 
 	<h4>Bug</h4>
 	<ul>
@@ -370,7 +386,7 @@
 	</ul>
 
 
-	<a name="v310RC4"></a><h3>1.vi. Changes since 3.1.0-RC4</h3>
+	<a name="v310RC4"></a><h3>Changes since 3.1.0-RC4</h3>
 
 	<h4>Bug</h4>
 	<ul>
@@ -437,7 +453,7 @@
 		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13123">PHPBB3-13123</a>] - Add events to allow post blocking and post pre/past processing</li>
 	</ul>
 
-	<a name="v310RC3"></a><h3>1.vii. Changes since 3.1.0-RC3</h3>
+	<a name="v310RC3"></a><h3>Changes since 3.1.0-RC3</h3>
 
 	<h4>Bug</h4>
 	<ul>
@@ -527,7 +543,7 @@
 	</ul>
 
 
-	<a name="v310RC2"></a><h3>1.viii. Changes since 3.1.0-RC2</h3>
+	<a name="v310RC2"></a><h3>Changes since 3.1.0-RC2</h3>
 
 	<h4>Bug</h4>
 	<ul>
@@ -651,7 +667,7 @@
 		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12948">PHPBB3-12948</a>] - Remove Travis CI &quot;broken opcache on PHP 5.5.7 and 5.5.8&quot; workaround.</li>
 	</ul>
 
-	<a name="v310RC1"></a><h3>1.ix. Changes since 3.1.0-RC1</h3>
+	<a name="v310RC1"></a><h3>Changes since 3.1.0-RC1</h3>
 
 	<h4>Bug</h4>
 	<ul>
@@ -722,7 +738,7 @@
 		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12829">PHPBB3-12829</a>] - Remove check for pgsql 8.3/8.2</li>
 	</ul>
 
-	<a name="v310b4"></a><h3>1.x. Changes since 3.1.0-b4</h3>
+	<a name="v310b4"></a><h3>Changes since 3.1.0-b4</h3>
 
 	<h4>Bug</h4>
 	<ul>
@@ -842,7 +858,7 @@
 	</ul>
 
 
-	<a name="v310b3"></a><h3>1.xi. Changes since 3.1.0-b3</h3>
+	<a name="v310b3"></a><h3>Changes since 3.1.0-b3</h3>
 
 	<h4>Bug</h4>
 	<ul>
@@ -949,7 +965,7 @@
 	</ul>
 
 
-	<a name="v310b2"></a><h3>1.xii. Changes since 3.1.0-b2</h3>
+	<a name="v310b2"></a><h3>Changes since 3.1.0-b2</h3>
 
 	<h4>Bug</h4>
 	<ul>
@@ -1114,7 +1130,7 @@
 	</ul>
 
 
-	<a name="v310b1"></a><h3>1.xiii. Changes since 3.1.0-b1</h3>
+	<a name="v310b1"></a><h3>Changes since 3.1.0-b1</h3>
 
 	<h4>Bug</h4>
 	<ul>
@@ -1182,7 +1198,7 @@
 		<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12302">PHPBB3-12302</a>] - Upgrade composer.phar to 1.0.0-alpha8</li>
 	</ul>
 
-	<a name="v310a3"></a><h3>1.xiv. Changes since 3.1.0-a3</h3>
+	<a name="v310a3"></a><h3>Changes since 3.1.0-a3</h3>
 
 	<h4>Bug</h4>
 	<ul>
@@ -1329,7 +1345,7 @@
 	</ul>
 
 
-	<a name="v310a2"></a><h3>1.xv. Changes since 3.1.0-a2</h3>
+	<a name="v310a2"></a><h3>Changes since 3.1.0-a2</h3>
 
 <h4>Bug</h4>
 <ul>
@@ -1437,7 +1453,7 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12147">PHPBB3-12147</a>] - Remove Travis CI notification configuration</li>
 </ul>
 
-	<a name="v310a1"></a><h3>1.xvi. Changes since 3.1.0-a1</h3>
+	<a name="v310a1"></a><h3>Changes since 3.1.0-a1</h3>
 
 <h4>Bug</h4>
 <ul>
@@ -1513,7 +1529,7 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11998">PHPBB3-11998</a>] - Add console / command line client environment </li>
 </ul>
 
-	<a name="v30x"></a><h3>1.xvii. Changes since 3.0.x</h3>
+	<a name="v30x"></a><h3>Changes since 3.0.x</h3>
 
 <h4>Bug</h4>
 <ul>
@@ -2194,7 +2210,16 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11913">PHPBB3-11913</a>] - Apply reorganisation of download.phpbb.com to build_announcement.php</li>
 </ul>
 
-	<a name="v3012"></a><h3>1.xviii. Changes since 3.0.12</h3>
+	<a name="v3013"></a><h3>Changes since 3.0.13</h3>
+
+<h4>Bug</h4>
+<ul>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-12933">PHPBB3-12933</a>] - The search operator for partial matches does not work</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13549">PHPBB3-13549</a>] - Compare ORIG_PATH_INFO with SCRIPT_NAME for checking trailing paths</li>
+<li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13554">PHPBB3-13554</a>] - Advertisement of feature release in red indicates a problem</li>
+</ul>
+
+	<a name="v3012"></a><h3>Changes since 3.0.12</h3>
 
 <h4>Security</h4>
 <ul>
@@ -2330,7 +2355,7 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-13324">PHPBB3-13324</a>] - Composer no longer downloads sami/sami and fabpot/goutte</li>
 </ul>
 
-	<a name="v3011"></a><h3>1.xix. Changes since 3.0.11</h3>
+	<a name="v3011"></a><h3>Changes since 3.0.11</h3>
 
 <h4>Bug</h4>
 <ul>
@@ -2485,7 +2510,7 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-11753">PHPBB3-11753</a>] - Upgrade mysql_upgrader.php schema data.</li>
 </ul>
 
-	<a name="v3010"></a><h3>1.xx. Changes since 3.0.10</h3>
+	<a name="v3010"></a><h3>Changes since 3.0.10</h3>
 
 <h4>Bug</h4>
 <ul>
@@ -2610,7 +2635,7 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10909">PHPBB3-10909</a>] - Update Travis Test Configuration: Travis no longer supports PHP 5.3.2</li>
 </ul>
 
-	<a name="v309"></a><h3>1.xxi. Changes since 3.0.9</h3>
+	<a name="v309"></a><h3>Changes since 3.0.9</h3>
 
 <h4>Bug</h4>
 <ul>
@@ -2746,7 +2771,7 @@
 <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-10480">PHPBB3-10480</a>] - Automate changelog building</li>
 </ul>
 
-	<a name="v308"></a><h3>1.xxii. Changes since 3.0.8</h3>
+	<a name="v308"></a><h3>Changes since 3.0.8</h3>
 
 <h4>        Bug
 </h4>
@@ -3113,8 +3138,7 @@
 </li>
 </ul>
 
-
-	<a name="v307-PL1"></a><h3>1.xxiii. Changes since 3.0.7-PL1</h3>
+	<a name="v307-PL1"></a><h3>Changes since 3.0.7-PL1</h3>
 
 <h4>        Security
 </h4>
@@ -3572,14 +3596,13 @@
 </li>
 </ul>
 
-
-	<a name="v307"></a><h3>1.xxiv. Changes since 3.0.7</h3>
+	<a name="v307"></a><h3>Changes since 3.0.7</h3>
 
 	<ul>
 		<li>[Sec] Do not expose forum content of forums with ACL entries but no actual permission in ATOM Feeds. (Bug #58595)</li>
 	</ul>
 
-	<a name="v306"></a><h3>1.xxv. Changes since 3.0.6</h3>
+	<a name="v306"></a><h3>Changes since 3.0.6</h3>
 
 	<ul>
 		<li>[Fix] Allow ban reason and length to be selected and copied in ACP and subsilver2 MCP. (Bug #51095)</li>
@@ -3683,7 +3706,7 @@
 
 	</ul>
 
-	<a name="v305"></a><h3>1.xxvi. Changes since 3.0.5</h3>
+	<a name="v305"></a><h3>Changes since 3.0.5</h3>
 
 	<ul>
 		<li>[Fix] Allow whitespaces in avatar gallery names. (Bug #44955)</li>
@@ -3905,7 +3928,7 @@
 		<li>[Feature] Send anonymous statistical information to phpBB on installation and update (optional).</li>
 	</ul>
 
-	<a name="v304"></a><h3>1.xxvii. Changes since 3.0.4</h3>
+	<a name="v304"></a><h3>Changes since 3.0.4</h3>
 
 	<ul>
 		<li>[Fix] Delete user entry from ban list table upon user deletion (Bug #40015 - Patch by TerraFrost)</li>
@@ -3994,7 +4017,7 @@
 		<li>[Sec] Only use forum id supplied for posting if global announcement detected. (Reported by nickvergessen)</li>
 	</ul>
 
-	<a name="v303"></a><h3>1.xxviii. Changes since 3.0.3</h3>
+	<a name="v303"></a><h3>Changes since 3.0.3</h3>
 
 	<ul>
 		<li>[Fix] Allow mixed-case template directories to be inherited (Bug #36725)</li>
@@ -4026,7 +4049,7 @@
 		<li>[Sec] Ask for forum password if post within passworded forum quoted in private message. (Reported by nickvergessen)</li>
 	</ul>
 
-	<a name="v302"></a><h3>1.xxix. Changes since 3.0.2</h3>
+	<a name="v302"></a><h3>Changes since 3.0.2</h3>
 
 	<ul>
 		<li>[Fix] Correctly set topic starter if first post in topic removed (Bug #30575 - Patch by blueray2048)</li>
@@ -4125,7 +4148,7 @@
 		<li>[Sec Precaution] Stricter validation of the HTTP_HOST header (Thanks to Techie-Micheal et al for pointing out possible issues in derived code)</li>
 	</ul>
 
-	<a name="v301"></a><h3>1.xxx. Changes since 3.0.1</h3>
+	<a name="v301"></a><h3>Changes since 3.0.1</h3>
 
 	<ul>
 		<li>[Fix] Ability to set permissions on non-mysql dbms (Bug #24955)</li>
@@ -4173,7 +4196,7 @@
 		<li>[Sec] Only allow urls gone through redirect() being used within login_box(). (thanks nookieman)</li>
 	</ul>
 
-	<a name="v300"></a><h3>1.xxxi. Changes since 3.0.0</h3>
+	<a name="v300"></a><h3>Changes since 3.0.0</h3>
 
 	<ul>
 		<li>[Change] Validate birthdays (Bug #15004)</li>
@@ -4244,7 +4267,7 @@
 		<li>[Fix] Find and display colliding usernames correctly when converting from one database to another (Bug #23925)</li>
 	</ul>
 
-	<a name="v30rc8"></a><h3>1.xxxii. Changes since 3.0.RC8</h3>
+	<a name="v30rc8"></a><h3>Changes since 3.0.RC8</h3>
 
 	<ul>
 		<li>[Fix] Cleaned usernames contain only single spaces, so &quot;a_name&quot; and &quot;a__name&quot; are treated as the same name (Bug #15634)</li>
@@ -4253,7 +4276,7 @@
 		<li>[Fix] Call garbage_collection() within database updater to correctly close connections (affects Oracle for example)</li>
 	</ul>
 
-	<a name="v30rc7"></a><h3>1.xxxiii. Changes since 3.0.RC7</h3>
+	<a name="v30rc7"></a><h3>Changes since 3.0.RC7</h3>
 
 	<ul>
 		<li>[Fix] Fixed MSSQL related bug in the update system</li>
@@ -4288,7 +4311,7 @@
 		<li>[Fix] No duplication of active topics (Bug #15474)</li>
 	</ul>
 
-	<a name="v30rc6"></a><h3>1.xxxiv. Changes since 3.0.RC6</h3>
+	<a name="v30rc6"></a><h3>Changes since 3.0.RC6</h3>
 
 	<ul>
 		<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
@@ -4298,7 +4321,7 @@
 		<li>[Fix] Able to request new password (Bug #14743)</li>
 	</ul>
 
-	<a name="v30rc5"></a><h3>1.xxxv. Changes since 3.0.RC5</h3>
+	<a name="v30rc5"></a><h3>Changes since 3.0.RC5</h3>
 
 	<ul>
 		<li>[Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.</li>
@@ -4361,7 +4384,7 @@
 		<li>[Sec] New password hashing mechanism for storing passwords (#i42)</li>
 	</ul>
 
-	<a name="v30rc4"></a><h3>1.xxxvi. Changes since 3.0.RC4</h3>
+	<a name="v30rc4"></a><h3>Changes since 3.0.RC4</h3>
 
 	<ul>
 		<li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li>
@@ -4412,7 +4435,7 @@
 		<li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li>
 	</ul>
 
-	<a name="v30rc3"></a><h3>1.xxxvii. Changes since 3.0.RC3</h3>
+	<a name="v30rc3"></a><h3>Changes since 3.0.RC3</h3>
 
 	<ul>
 		<li>[Fix] Fixing some subsilver2 and prosilver style issues</li>
@@ -4521,7 +4544,7 @@
 
 	</ul>
 
-	<a name="v30rc2"></a><h3>1.xxxviii. Changes since 3.0.RC2</h3>
+	<a name="v30rc2"></a><h3>Changes since 3.0.RC2</h3>
 
 	<ul>
 		<li>[Fix] Re-allow searching within the memberlist</li>
@@ -4567,7 +4590,7 @@
 
 	</ul>
 
-	<a name="v30rc1"></a><h3>1.xxxix. Changes since 3.0.RC1</h3>
+	<a name="v30rc1"></a><h3>Changes since 3.0.RC1</h3>
 
 	<ul>
 		<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>

phpBB/includes/constants.php

@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
 */
 
 // phpBB Version
-define('PHPBB_VERSION', '3.1.3-RC1');
+define('PHPBB_VERSION', '3.1.3-RC2');
 
 // QA-related
 // define('PHPBB_QA', 1);

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');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.3-RC2');
 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');
 

phpBB/phpbb/controller/helper.php

@@ -189,12 +189,29 @@ class helper
 	*/
 	public function error($message, $code = 500)
 	{
+		return $this->message($message, array(), 'INFORMATION', $code);
+	}
+
+	/**
+	 * Output a message
+	 *
+	 * In case of an error, please throw an exception instead
+	 *
+	 * @param string $message The message to display (must be a language variable)
+	 * @param array $parameters The parameters to use with the language var
+	 * @param string $title Title for the message (must be a language variable)
+	 * @param int $code The HTTP status code (e.g. 404, 500, 503, etc.)
+	 * @return Response A Response instance
+	 */
+	public function message($message, array $parameters = array(), $title = 'INFORMATION', $code = 200)
+	{
+		array_unshift($parameters, $message);
 		$this->template->assign_vars(array(
-			'MESSAGE_TEXT'	=> $message,
-			'MESSAGE_TITLE'	=> $this->user->lang('INFORMATION'),
+			'MESSAGE_TEXT'	=> call_user_func_array(array($this->user, 'lang'), $parameters),
+			'MESSAGE_TITLE'	=> $this->user->lang($title),
 		));
 
-		return $this->render('message_body.html', $this->user->lang('INFORMATION'), $code);
+		return $this->render('message_body.html', $this->user->lang($title), $code);
 	}
 
 	/**

phpBB/phpbb/db/migration/data/v30x/release_3_0_13.php

@@ -0,0 +1,37 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @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\v30x;
+
+class release_3_0_13 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.0.13', '>=') && phpbb_version_compare($this->config['version'], '3.1.0-dev', '<');
+	}
+
+	static public function depends_on()
+	{
+		return array('\phpbb\db\migration\data\v30x\release_3_0_13_rc1');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('if', array(
+				phpbb_version_compare($this->config['version'], '3.0.13', '<'),
+				array('config.update', array('version', '3.0.13')),
+			)),
+		);
+	}
+}

phpBB/phpbb/db/migration/data/v30x/release_3_0_13_pl1.php

@@ -0,0 +1,37 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @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\v30x;
+
+class release_3_0_13_pl1 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return phpbb_version_compare($this->config['version'], '3.0.13-PL1', '>=') && phpbb_version_compare($this->config['version'], '3.1.0-dev', '<');
+	}
+
+	static public function depends_on()
+	{
+		return array('\phpbb\db\migration\data\v30x\release_3_0_13');
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('if', array(
+				phpbb_version_compare($this->config['version'], '3.0.13-PL1', '<'),
+				array('config.update', array('version', '3.0.13-PL1')),
+			)),
+		);
+	}
+}

phpBB/phpbb/db/migration/data/v31x/v313rc2.php

@@ -0,0 +1,32 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @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 v313rc2 extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v30x\release_3_0_13_pl1',
+			'\phpbb\db\migration\data\v31x\v313rc1',
+		);
+	}
+
+	public function update_data()
+	{
+		return array(
+			array('config.update', array('version', '3.1.3-RC2')),
+		);
+	}
+}

phpBB/phpbb/db/migration/tool/permission.php

@@ -537,7 +537,8 @@ class permission implements \phpbb\db\migration\tool\tool_interface
 				}
 
 				$sql = 'DELETE FROM ' . ACL_ROLES_DATA_TABLE . '
-					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove);
+					WHERE ' . $this->db->sql_in_set('auth_option_id', $to_remove) . '
+						AND role_id = ' . (int) $role_id;
 				$this->db->sql_query($sql);
 			break;
 

phpBB/phpbb/file_downloader.php

@@ -33,7 +33,7 @@ class file_downloader
 	 * @return mixed File data as string if file can be read and there is no
 	 *			timeout, false if there were errors or the connection timed out
 	 *
-	 * @throws \RuntimeException If data can't be retrieved and no error
+	 * @throws \phpbb\exception\runtime_exception If data can't be retrieved and no error
 	 *		message is returned
 	 */
 	public function get($host, $directory, $filename, $port = 80, $timeout = 6)
@@ -69,7 +69,7 @@ class file_downloader
 					}
 					else if (stripos($line, '404 not found') !== false)
 					{
-						throw new \RuntimeException(array('FILE_NOT_FOUND', $filename));
+						throw new \phpbb\exception\runtime_exception('FILE_NOT_FOUND', array($filename));
 					}
 				}
 
@@ -77,7 +77,7 @@ class file_downloader
 
 				if (!empty($stream_meta_data['timed_out']) || time() >= $timer_stop)
 				{
-					throw new \RuntimeException('FSOCK_TIMEOUT');
+					throw new \phpbb\exception\runtime_exception('FSOCK_TIMEOUT');
 				}
 			}
 			@fclose($socket);

phpBB/phpbb/search/fulltext_native.php

@@ -300,7 +300,7 @@ class fulltext_native extends \phpbb\search\base
 		$this->search_query = $keywords;
 
 		$exact_words = array();
-		preg_match_all('#([^\\s+\\-|*()]+)(?:$|[\\s+\\-|()])#u', $keywords, $exact_words);
+		preg_match_all('#([^\\s+\\-|()]+)(?:$|[\\s+\\-|()])#u', $keywords, $exact_words);
 		$exact_words = $exact_words[1];
 
 		$common_ids = $words = array();

phpBB/phpbb/version_helper.php

@@ -257,9 +257,10 @@ class version_helper
 			try {
 				$info = $this->file_downloader->get($this->host, $this->path, $this->file);
 			}
-			catch (\RuntimeException $exception)
+			catch (\phpbb\exception\runtime_exception $exception)
 			{
-				throw new \RuntimeException($this->user->lang($exception->getMessage()));
+				$prepare_parameters = array_merge(array($exception->getMessage()), $exception->get_parameters());
+				throw new \RuntimeException(call_user_func_array(array($this->user, 'lang'), $prepare_parameters));
 			}
 			$error_string = $this->file_downloader->get_error_string();