From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli <thomas@roundcube.net> Date: Tue, 19 Aug 2014 12:08:35 -0400 Subject: [PATCH] Fix merge error that disabled contact drag'n'drop --- plugins/newmail_notifier/newmail_notifier.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/newmail_notifier/newmail_notifier.php b/plugins/newmail_notifier/newmail_notifier.php index 20ffac8..2c7ba94 100644 --- a/plugins/newmail_notifier/newmail_notifier.php +++ b/plugins/newmail_notifier/newmail_notifier.php @@ -51,7 +51,7 @@ else { // if ($this->rc->task == 'mail') { $this->add_hook('new_messages', array($this, 'notify')); // add script when not in ajax and not in frame - if (is_a($this->rc->output, 'rcube_template') && empty($_REQUEST['_framed'])) { + if ($this->rc->output->type == 'html' && empty($_REQUEST['_framed'])) { $this->add_texts('localization/'); $this->rc->output->add_label('newmail_notifier.title', 'newmail_notifier.body'); $this->include_script('newmail_notifier.js'); -- Gitblit v1.9.1