diff options
| author | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
|---|---|---|
| committer | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
| commit | 11a40dd1fef6c5b78b054617caba4325f95ee386 (patch) | |
| tree | de2e1d7efd6423ef4d1256dd5c90a972ad172719 /plugins/newmail_notifier/newmail_notifier.php | |
| parent | 187fd666aa2f32dedfe544d69b7cb213698197f2 (diff) | |
| parent | ba084313bfc9c7a5a83e0611fe4376543cc1653d (diff) | |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Conflicts:
plugins/password/config.inc.php.dist
Diffstat (limited to 'plugins/newmail_notifier/newmail_notifier.php')
| -rw-r--r-- | plugins/newmail_notifier/newmail_notifier.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/newmail_notifier/newmail_notifier.php b/plugins/newmail_notifier/newmail_notifier.php index 20c542f58..efac69116 100644 --- a/plugins/newmail_notifier/newmail_notifier.php +++ b/plugins/newmail_notifier/newmail_notifier.php @@ -52,8 +52,8 @@ class newmail_notifier extends rcube_plugin $this->add_hook('preferences_save', array($this, 'prefs_save')); } else { // if ($this->rc->task == 'mail') { - // add script when not in ajax and not in frame - if ($this->rc->output->type == 'html' && empty($_REQUEST['_framed'])) { + // add script when not in ajax and not in frame and only in main window + if ($this->rc->output->type == 'html' && empty($_REQUEST['_framed']) && $this->rc->action == '') { $this->add_texts('localization/'); $this->rc->output->add_label('newmail_notifier.title', 'newmail_notifier.body'); $this->include_script('newmail_notifier.js'); |