diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2020-01-02 09:59:25 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2020-01-02 09:59:25 +0100 |
| commit | db5121511d09aa6f19644dfa6fe47d760c4355f9 (patch) | |
| tree | c0003b620775417674c92d110ab7a145f1a7b8ca /phpBB/phpbb | |
| parent | b9193f35c1d964e3445d3933d877be3049954411 (diff) | |
| parent | 0806d34eee9a302bb8a699ee49f04b0592aa06c6 (diff) | |
| download | forums-db5121511d09aa6f19644dfa6fe47d760c4355f9.tar forums-db5121511d09aa6f19644dfa6fe47d760c4355f9.tar.gz forums-db5121511d09aa6f19644dfa6fe47d760c4355f9.tar.bz2 forums-db5121511d09aa6f19644dfa6fe47d760c4355f9.tar.xz forums-db5121511d09aa6f19644dfa6fe47d760c4355f9.zip | |
Merge pull request #5802 from 3D-I/ticket/16279
[ticket/16279] Add permission for Emoji in topic title
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v32x/user_emoji_permission.php | 44 | ||||
| -rw-r--r-- | phpBB/phpbb/permissions.php | 1 |
2 files changed, 45 insertions, 0 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/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'), |