From 66611f40971344a15d0118cd7051a39c3de0e445 Mon Sep 17 00:00:00 2001
From: VESSILLER <lvessiller@open-dsi.fr>
Date: Mon, 9 Sep 2019 09:29:43 +0200
Subject: [PATCH] FIX rename "resource" (reserved) by "dolresource"

---
 htdocs/comm/action/card.php          | 2 +-
 htdocs/resource/element_resource.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index c9a4f782b4d..44d6b000efe 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -520,7 +520,7 @@ if ($action == 'update')
 
                 $sql  = "SELECT er.rowid, r.ref as r_ref, ac.id as ac_id, ac.label as ac_label";
                 $sql .= " FROM " . MAIN_DB_PREFIX . "element_resources as er";
-                $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "resource as r ON r.rowid = er.resource_id AND er.resource_type = 'resource'";
+                $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "resource as r ON r.rowid = er.resource_id AND er.resource_type = 'dolresource'";
                 $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "actioncomm as ac ON ac.id = er.element_id AND er.element_type = '" . $db->escape($object->element) . "'";
                 $sql .= " WHERE ac.id != " . $object->id;
                 $sql .= " AND er.resource_id IN (";
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index b842ad6c832..bb9a54a9bf0 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -105,7 +105,7 @@ if (empty($reshook))
 
             // TODO : add this check at update_linked_resource and when modifying event start or end date
             // check if an event resource is already in use
-            if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $objstat->element=='action' && $resource_type=='resource' && intval($busy)==1) {
+            if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $objstat->element=='action' && $resource_type=='dolresource' && intval($busy)==1) {
                 $eventDateStart = $objstat->datep;
                 $eventDateEnd   = $objstat->datef;
                 $isFullDayEvent = intval($objstat->fulldayevent);
@@ -185,7 +185,7 @@ if (empty($reshook))
 			$object->busy = $busy;
 			$object->mandatory = $mandatory;
 
-            if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element_type=='action' && $object->resource_type=='resource' && intval($object->busy)==1) {
+            if (!empty($conf->global->RESOURCE_USED_IN_EVENT_CHECK) && $object->element_type=='action' && $object->resource_type=='dolresource' && intval($object->busy)==1) {
                 $eventDateStart = $object->objelement->datep;
                 $eventDateEnd   = $object->objelement->datef;
                 $isFullDayEvent = intval($objstat->fulldayevent);