From 48eb74cfcdad2aaa88cb6a1a50620ecf9180ac7d Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Mon, 30 Dec 2019 02:25:26 +0100
Subject: [ticket/16279] Add permission for Emoji in topic title

PHPBB3-16279
---
 .../migration/data/v32x/user_emoji_permission.php  | 43 ++++++++++++++++++++++
 phpBB/phpbb/permissions.php                        |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 phpBB/phpbb/db/migration/data/v32x/user_emoji_permission.php

(limited to 'phpBB/phpbb')

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..a915f1e140
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v32x/user_emoji_permission.php
@@ -0,0 +1,43 @@
+<?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']],
+		];
+	}
+}
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'),
-- 
cgit v1.2.1


From fa099867a8bd2442019822077b09ab7d3569da7a Mon Sep 17 00:00:00 2001
From: 3D-I <480857+3D-I@users.noreply.github.com>
Date: Wed, 1 Jan 2020 19:11:06 +0100
Subject: [ticket/16279] Add permission for Emoji in topic title

PHPBB3-16279
---
 phpBB/phpbb/db/migration/data/v32x/user_emoji_permission.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/phpbb')

diff --git a/phpBB/phpbb/db/migration/data/v32x/user_emoji_permission.php b/phpBB/phpbb/db/migration/data/v32x/user_emoji_permission.php
index a915f1e140..98759c78ee 100644
--- a/phpBB/phpbb/db/migration/data/v32x/user_emoji_permission.php
+++ b/phpBB/phpbb/db/migration/data/v32x/user_emoji_permission.php
@@ -38,6 +38,7 @@ class user_emoji_permission extends \phpbb\db\migration\migration
 	{
 		return [
 			['permission.add', ['u_emoji']],
+			['permission.permission_set', ['REGISTERED', 'u_emoji', 'group']],
 		];
 	}
 }
-- 
cgit v1.2.1