Fix so disabling emoticons plugin really removes emoticons button from HTML...

Aleksander Machniak

2015-10-27 2aa9ee56fd8f4e36c9d5c65cf1b7dc15def11f82

 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;