From 42f9e6b735c80c9cc362db7feff666276e8b7dda Mon Sep 17 00:00:00 2001 From: James Woods Date: Thu, 26 Jul 2012 19:58:08 -0400 Subject: [PATCH] The function content_permissions_field_access() function expects an array for the 2nd argument, resource_conflict.module is sending a string. I created an array that the content_permissions_field_access() would accpet and replaced the original string with the new array in the function call. --- .../resource_conflict/resource_conflict.module | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sites/all/modules/contrib/resource_conflict/resource_conflict.module b/sites/all/modules/contrib/resource_conflict/resource_conflict.module index e65a5ac..d06c265 100644 --- a/sites/all/modules/contrib/resource_conflict/resource_conflict.module +++ b/sites/all/modules/contrib/resource_conflict/resource_conflict.module @@ -18,7 +18,7 @@ function resource_conflict_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) { // Find the date field to use for time overlapping_node_ids detection. $date_field = variable_get('rc_date_field_' . $type, FALSE); - + $date_field_perm_check = array('field_name' => $date_field); $overlapping_node_ids = array(); if (strpos($date_field, 'field_', 0) === 0) { @@ -28,7 +28,7 @@ function resource_conflict_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) { // Get all conflicting Date nodes global $user; - if ( ! module_exists('content_permissions') || content_permissions_field_access('edit', $date_field, $user ) ) { + if ( ! module_exists('content_permissions') || content_permissions_field_access('edit', $date_field_perm_check, $user ) ) { if (!empty($start) && !empty($end) ) { $overlapping_node_ids = _resource_conflict_overlaps_from_date($start, $end); } else { -- 1.7.2.5