From 0d564cb0fb4b3ffcbb5ad911321741791ac18bfb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Philipp=20Sch=C3=BCle?= Date: Mon, 17 Jul 2017 10:24:37 +0200 Subject: [PATCH 1/1] get JS files of all installed apps MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ... to be able to enable/disable apps without having to drop the browser caches Change-Id: I0ddd52f64597003bc4bdf5e16ff01d13c81ab775 Reviewed-on: http://gerrit.tine20.com/customers/5207 Tested-by: Jenkins CI (http://ci.tine20.com/) Reviewed-by: Philipp Schüle --- tine20/Tinebase/Frontend/Http.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tine20/Tinebase/Frontend/Http.php b/tine20/Tinebase/Frontend/Http.php index 20a2892..a08e773 100644 --- a/tine20/Tinebase/Frontend/Http.php +++ b/tine20/Tinebase/Frontend/Http.php @@ -592,8 +592,8 @@ class Tinebase_Frontend_Http extends Tinebase_Frontend_Http_Abstract protected function _getFilesToWatch($_fileType) { $requiredApplications = array('Tinebase', 'Admin', 'Addressbook'); - $enabledApplications = Tinebase_Application::getInstance()->getApplicationsByState(Tinebase_Application::ENABLED)->name; - $orderedApplications = array_merge($requiredApplications, array_diff($enabledApplications, $requiredApplications)); + $installedApplications = Tinebase_Application::getInstance()->getApplications(null, /* sort = */ 'order')->name; + $orderedApplications = array_merge($requiredApplications, array_diff($installedApplications, $requiredApplications)); $filesToWatch = array(); $fileMap = $this->getAssetsMap(); -- 2.7.4