5 files changed, 51 insertions, 8 deletions
diff --git a/phpBB/phpbb/db/migration/data/v32x/user_emoji_permission.php b/phpBB/phpbb/db/migration/data/v32x/user_emoji_permission.php
new file mode 100644
index 0000000000..98759c78ee
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v32x/user_emoji_permission.php
@@ -0,0 +1,44 @@
+<?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\v32x;
+
+class user_emoji_permission extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		$sql = 'SELECT auth_option_id
+			FROM ' . ACL_OPTIONS_TABLE . "
+			WHERE auth_option = 'u_emoji'";
+		$result = $this->db->sql_query($sql);
+		$auth_option_id = $this->db->sql_fetchfield('auth_option_id');
+		$this->db->sql_freeresult($result);
+
+		return $auth_option_id !== false;
+	}
+
+	static public function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v32x\v329rc1',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['permission.add', ['u_emoji']],
+			['permission.permission_set', ['REGISTERED', 'u_emoji', 'group']],
+		];
+	}
+}
diff --git a/phpBB/phpbb/feed/controller/feed.php b/phpBB/phpbb/feed/controller/feed.php
index c0d7bc72ec..7826d19042 100644
--- a/phpBB/phpbb/feed/controller/feed.php
+++ b/phpBB/phpbb/feed/controller/feed.php
@@ -308,14 +308,13 @@ class feed
 			 * Event to modify the feed row
 			 *
 			 * @event core.feed_modify_feed_row
-			 * @var	int		forum_id	Forum ID
-			 * @var	string	mode		Feeds mode (forums|topics|topics_new|topics_active|news)
+			 * @var	feed_interface feed Feed instance
 			 * @var	array	row			Array with feed data
-			 * @var	int		topic_id	Topic ID
 			 *
 			 * @since 3.1.10-RC1
+			 * @changed 3.3.0 Replace forum_id, mode, topic_id with feed instance
 			 */
-			$vars = array('forum_id', 'mode', 'row', 'topic_id');
+			$vars = array('feed', 'row');
 			extract($this->phpbb_dispatcher->trigger_event('core.feed_modify_feed_row', compact($vars)));
 
 			// BBCode options to correctly disable urls, smilies, bbcode...
diff --git a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
index 4607ce9ec2..41aa82623b 100644
--- a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
+++ b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php
@@ -96,9 +96,7 @@ class check_server_environment extends \phpbb\install\task_base
 	 */
 	protected function check_php_version()
 	{
-		$php_version = PHP_VERSION;
-
-		if (version_compare($php_version, '7.1') < 0)
+		if (version_compare(PHP_VERSION, '7.1.3', '<'))
 		{
 			$this->response_helper->add_error_message('PHP_VERSION_REQD', 'PHP_VERSION_REQD_EXPLAIN');
 
diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php
index 7697884b6a..236535cc6a 100644
--- a/phpBB/phpbb/permissions.php
+++ b/phpBB/phpbb/permissions.php
@@ -234,6 +234,7 @@ class permissions
 		'u_savedrafts'	=> array('lang' => 'ACL_U_SAVEDRAFTS', 'cat' => 'post'),
 		'u_chgcensors'	=> array('lang' => 'ACL_U_CHGCENSORS', 'cat' => 'post'),
 		'u_sig'			=> array('lang' => 'ACL_U_SIG', 'cat' => 'post'),
+		'u_emoji'		=> array('lang' => 'ACL_U_EMOJI', 'cat' => 'post'),
 
 		'u_sendpm'		=> array('lang' => 'ACL_U_SENDPM', 'cat' => 'pm'),
 		'u_masspm'		=> array('lang' => 'ACL_U_MASSPM', 'cat' => 'pm'),
diff --git a/phpBB/phpbb/request/type_cast_helper.php b/phpBB/phpbb/request/type_cast_helper.php
index 912494998d..39d5908fd3 100644
--- a/phpBB/phpbb/request/type_cast_helper.php
+++ b/phpBB/phpbb/request/type_cast_helper.php
@@ -106,7 +106,8 @@ class type_cast_helper implements \phpbb\request\type_cast_helper_interface
 				return;
 			}
 
-			list($default_key, $default_value) = each($default);
+			$default_key = key($default);
+			$default_value = current($default);
 			$key_type = gettype($default_key);
 
 			$_var = $var;