diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-06-18 11:07:22 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-06-18 11:07:22 +0000 |
| commit | ab33dd2b08b384c85c8d22b8fb481b248491fc93 (patch) | |
| tree | 6fdb788ce01ce99327c1e226e0a99a88fde85ee4 | |
| parent | 815bbac230917ae2110bd9d719f763d5bba1c52f (diff) | |
| download | forums-ab33dd2b08b384c85c8d22b8fb481b248491fc93.tar forums-ab33dd2b08b384c85c8d22b8fb481b248491fc93.tar.gz forums-ab33dd2b08b384c85c8d22b8fb481b248491fc93.tar.bz2 forums-ab33dd2b08b384c85c8d22b8fb481b248491fc93.tar.xz forums-ab33dd2b08b384c85c8d22b8fb481b248491fc93.zip | |
Change bug #26545 - Smilies no longer require the f_bbcode permission.
Authorised by: acydburn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9615 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/posting.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index d5930bfd58..e42d5b6d0c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -123,6 +123,7 @@ <li>[Change] Template engine now permits to a limited extent variable includes.</li> <li>[Change] Quote BBCode no longer requires the f_reply permission. (Bug #16079)</li> <li>[Change] Banning/unbanning users now generates an entry in their user notes (Bug #21825 - Patch by nickvergessen)</li> + <li>[Change] Smilies no longer require the f_bbcode permission. (Bug #26545)</li> <li>[Feature] Backported 3.2 captcha plugins.</li> <li>[Feature] Introduced new ACM plugins: <ul> diff --git a/phpBB/posting.php b/phpBB/posting.php index 013e4da633..4b715a66a2 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -494,7 +494,7 @@ if ($mode == 'edit' && $post_data['bbcode_uid']) // HTML, BBCode, Smilies, Images and Flash status $bbcode_status = ($config['allow_bbcode'] && $auth->acl_get('f_bbcode', $forum_id)) ? true : false; -$smilies_status = ($bbcode_status && $config['allow_smilies'] && $auth->acl_get('f_smilies', $forum_id)) ? true : false; +$smilies_status = ($config['allow_smilies'] && $auth->acl_get('f_smilies', $forum_id)) ? true : false; $img_status = ($bbcode_status && $auth->acl_get('f_img', $forum_id)) ? true : false; $url_status = ($config['allow_post_links']) ? true : false; $flash_status = ($bbcode_status && $auth->acl_get('f_flash', $forum_id) && $config['allow_post_flash']) ? true : false; |