From bd02c5bd085e957aa4341e7fc2df2199081ab069 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 6 Oct 2019 12:07:35 +0200
Subject: [ticket/16051] Remove mysql driver as it's no longer supported in PHP
 >= 7.0

PHPBB3-16051
---
 phpBB/develop/add_permissions.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'phpBB/develop/add_permissions.php')

diff --git a/phpBB/develop/add_permissions.php b/phpBB/develop/add_permissions.php
index d7308a1acc..d2c8bffd90 100644
--- a/phpBB/develop/add_permissions.php
+++ b/phpBB/develop/add_permissions.php
@@ -210,7 +210,7 @@ foreach ($prefixes as $prefix)
 			);
 
 			$db->sql_query('INSERT INTO ' . ACL_OPTIONS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary));
-		
+
 			echo "<p><b>Adding $auth_option...</b></p>\n";
 
 			mass_auth('group', 0, 'guests', $auth_option, ACL_NEVER);
@@ -231,7 +231,7 @@ $db->sql_query($sql);
 $cache->destroy('_acl_options');
 
 echo "<p><b>Done</b></p>\n";
- 
+
 /*
 	$ug_type = user|group
 	$forum_id = forum ids (array|int|0) -> 0 == all forums
@@ -374,11 +374,6 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting)
 			case 'insert':
 				switch ($db->get_sql_layer())
 				{
-					case 'mysql':
-					case 'mysql4':
-						$sql = 'VALUES ' . implode(', ', preg_replace('#^(.*?)$#', '(\1)', $sql_subary));
-						break;
-
 					case 'sqlite3':
 						$sql = implode(' UNION ALL ', preg_replace('#^(.*?)$#', 'SELECT \1', $sql_subary));
 						break;
-- 
cgit v1.2.1


From 364461b58fd40af8fe8c7513fe9424de483055b9 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
---
 phpBB/develop/add_permissions.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'phpBB/develop/add_permissions.php')

diff --git a/phpBB/develop/add_permissions.php b/phpBB/develop/add_permissions.php
index d7308a1acc..ee5e116d91 100644
--- a/phpBB/develop/add_permissions.php
+++ b/phpBB/develop/add_permissions.php
@@ -156,6 +156,7 @@ $u_permissions = array(
 	'u_download'	=> array(0, 1),
 	'u_attach'		=> array(0, 1),
 	'u_sig'			=> array(0, 1),
+	'u_emoji'		=> array(0, 1),
 	'u_pm_attach'	=> array(0, 1),
 	'u_pm_bbcode'	=> array(0, 1),
 	'u_pm_smilies'	=> array(0, 1),
-- 
cgit v1.2.1