plugins/calendar plugins/kolab_addressbook plugins/kolab_notes plugins/tasklist

[Thomas Brüderli]

 plugins/calendar/lib/calendar_ui.php                   |    2 +-
 plugins/kolab_addressbook/lib/kolab_addressbook_ui.php |    2 +-
 plugins/kolab_notes/kolab_notes_ui.php                 |    2 +-
 plugins/tasklist/tasklist_ui.php                       |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 0e0f1443a6f7ca4ea66cd079bdcd75b11d39a94f
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Tue Dec 16 14:12:21 2014 +0100

    Replace check for js file with check if libkolab plugin is loaded (#4114)

diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index 15d24d5..f902b77 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -119,7 +119,7 @@ class calendar_ui
     $this->rc->output->include_script('treelist.js');
 
     // include kolab folderlist widget if available
-    if (is_readable($this->cal->api->dir . 'libkolab/js/folderlist.js')) {
+    if (in_array('libkolab', $this->cal->api->loaded_plugins())) {
         $this->cal->api->include_script('libkolab/js/folderlist.js');
     }
 
diff --git a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
index e811532..6547648 100644
--- a/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
+++ b/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php
@@ -55,7 +55,7 @@ class kolab_addressbook_ui
             $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/kolab_addressbook.css');
 
             // include kolab folderlist widget if available
-            if (is_readable($this->plugin->api->dir . 'libkolab/js/folderlist.js')) {
+            if (in_array('libkolab', $this->plugin->api->loaded_plugins())) {
                 $this->plugin->api->include_script('libkolab/js/folderlist.js');
             }
 
diff --git a/plugins/kolab_notes/kolab_notes_ui.php b/plugins/kolab_notes/kolab_notes_ui.php
index 8c09989..c03ea2d 100644
--- a/plugins/kolab_notes/kolab_notes_ui.php
+++ b/plugins/kolab_notes/kolab_notes_ui.php
@@ -58,7 +58,7 @@ class kolab_notes_ui
         $this->plugin->include_script('jquery.tagedit.js');
 
         // include kolab folderlist widget if available
-        if (is_readable($this->plugin->api->dir . 'libkolab/js/folderlist.js')) {
+        if (in_array('libkolab', $this->plugin->api->loaded_plugins())) {
             $this->plugin->api->include_script('libkolab/js/folderlist.js');
         }
 
diff --git a/plugins/tasklist/tasklist_ui.php b/plugins/tasklist/tasklist_ui.php
index 3258418..922f295 100644
--- a/plugins/tasklist/tasklist_ui.php
+++ b/plugins/tasklist/tasklist_ui.php
@@ -156,7 +156,7 @@ class tasklist_ui
         $this->rc->output->include_script('treelist.js');
 
         // include kolab folderlist widget if available
-        if (is_readable($this->plugin->api->dir . 'libkolab/js/folderlist.js')) {
+        if (in_array('libkolab', $this->plugin->api->loaded_plugins())) {
             $this->plugin->api->include_script('libkolab/js/folderlist.js');
         }