From 9ac901b90aedcee1069bcc389ec4207e79637b1f Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 24 Feb 2016 12:54:08 +0100 Subject: [PATCH] Performance: SKip some SQL queries on "empty" tasklist refresh --- plugins/libkolab/lib/kolab_storage_config.php | 11 ++++++++--- .../tasklist/drivers/kolab/tasklist_kolab_driver.php | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/plugins/libkolab/lib/kolab_storage_config.php b/plugins/libkolab/lib/kolab_storage_config.php index 302392ff..771b9ff1 100644 --- a/plugins/libkolab/lib/kolab_storage_config.php +++ b/plugins/libkolab/lib/kolab_storage_config.php @@ -567,12 +567,17 @@ class kolab_storage_config /** * Assign tags to kolab objects * - * @param array $records List of kolab objects + * @param array $records List of kolab objects + * @param bool $no_return Don't return anything * * @return array List of tags */ - public function apply_tags(&$records) + public function apply_tags(&$records, $no_return = false) { + if (empty($records) && $no_return) { + return; + } + // first convert categories into tags foreach ($records as $i => $rec) { if (!empty($rec['categories'])) { @@ -603,7 +608,7 @@ class kolab_storage_config $tags[] = $tag['name']; } - $tags = array_unique($tags); + $tags = $no_return ? null : array_unique($tags); return $tags; } diff --git a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php index 0c5a65c6..fe1af558 100644 --- a/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php +++ b/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php @@ -597,7 +597,7 @@ class tasklist_kolab_driver extends tasklist_driver } } - $config->apply_tags($results); + $config->apply_tags($results, true); $config->apply_links($results); foreach (array_keys($results) as $idx) {