From 22409b88c513bc4dc5c87b3dfe0a4f0915229b37 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Wed, 11 Mar 2015 20:18:28 +0100 Subject: Add sanity check before attempting to add scripts to a non-html output object --- plugins/jqueryui/jqueryui.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'plugins/jqueryui/jqueryui.php') diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php index 1511ac5cf..006164c69 100644 --- a/plugins/jqueryui/jqueryui.php +++ b/plugins/jqueryui/jqueryui.php @@ -21,6 +21,12 @@ class jqueryui extends rcube_plugin public function init() { $rcmail = rcmail::get_instance(); + + // the plugin might have been force-loaded so do some sanity check first + if ($rcmail->output->type != 'html') { + return; + } + $this->load_config(); // include UI scripts -- cgit v1.2.3 From ca8cfd86546e8c222205c77ca1e6c91c09f01305 Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Tue, 14 Apr 2015 15:31:54 +0200 Subject: Don't load jquery UI scripts twice --- plugins/jqueryui/jqueryui.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/jqueryui/jqueryui.php') diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php index 006164c69..7853d0993 100644 --- a/plugins/jqueryui/jqueryui.php +++ b/plugins/jqueryui/jqueryui.php @@ -23,7 +23,7 @@ class jqueryui extends rcube_plugin $rcmail = rcmail::get_instance(); // the plugin might have been force-loaded so do some sanity check first - if ($rcmail->output->type != 'html') { + if ($rcmail->output->type != 'html' || self::$ui_theme) { return; } -- cgit v1.2.3