From b884e014d7ce6fe2da3ad9f497f76ce3d26d13f7 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 12 Sep 2016 11:42:27 -0600 Subject: [PATCH] Fix resource booking conflict indication --- resources/inc/class.resources_bo.inc.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/inc/class.resources_bo.inc.php b/resources/inc/class.resources_bo.inc.php index e7e6c7160c..ce1a7da473 100755 --- a/resources/inc/class.resources_bo.inc.php +++ b/resources/inc/class.resources_bo.inc.php @@ -534,11 +534,12 @@ class resources_bo */ public static function calendar_search($search, $options) { - // Resources - $list = Link::query('resources', $search, $options); + $bo = new resources_bo(); + + // Resources - call direct to avoid cache + $list = $bo->link_query($search, $options); // Categories - $bo = new resources_bo(); $cats = $bo->acl->get_cats(Acl::READ); foreach($cats as $cat_id => $cat) { @@ -562,7 +563,7 @@ class resources_bo else if ($resources && $options['exec']) { array_map( - function($id,$name) use (&$list) { $list[''.$id] = $name;}, + function($id,$name) use (&$list) { if(!$list[''.$id]) $list[''.$id] = $name;}, array_keys($resources), $resources ); }