From 2aa9ee56fd8f4e36c9d5c65cf1b7dc15def11f82 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 27 Oct 2015 12:18:23 -0400
Subject: [PATCH] Fix so disabling emoticons plugin really removes emoticons button from HTML editor

---
 plugins/emoticons/emoticons.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/emoticons/emoticons.php b/plugins/emoticons/emoticons.php
index cb90b6f..d5f0e9a 100644
--- a/plugins/emoticons/emoticons.php
+++ b/plugins/emoticons/emoticons.php
@@ -122,9 +122,9 @@
 
         $this->load_config();
 
-        if (!$rcube->config->get('emoticons_compose', true)) {
-            $args['disabled_plugins'][] = 'emoticons';
-            $args['disabled_buttons'][] = 'emoticons';
+        if ($rcube->config->get('emoticons_compose', true)) {
+            $args['extra_plugins'][] = 'emoticons';
+            $args['extra_buttons'][] = 'emoticons';
         }
 
         return $args;

--
Gitblit v1.9.1