From 5eee292663d82b274f0152ef4da6c474f88ed02d Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 15 Feb 2018 13:40:17 +0100
Subject: [PATCH] FIX #8189

---
 htdocs/admin/resource.php             | 4 ++--
 htdocs/admin/resource_extrafields.php | 2 +-
 htdocs/core/lib/resource.lib.php      | 2 +-
 htdocs/langs/en_US/admin.lang         | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index 3f057bbdbb9..68cc1172bdd 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -46,7 +46,7 @@ $action = GETPOST('action', 'alpha');
 
 if ($action == 'updateoptions')
 {
-	if (GETPOST('activate_RESOURCE_USE_SEARCH_TO_SELECT'))
+	if (GETPOST('activate_RESOURCE_USE_SEARCH_TO_SELECT') != '')
 	{
 		if (dolibarr_set_const($db, "RESOURCE_USE_SEARCH_TO_SELECT", GETPOST('activate_RESOURCE_USE_SEARCH_TO_SELECT'), 'chaine', 0, '', $conf->entity))
 		{
@@ -70,7 +70,7 @@ print load_fiche_titre($langs->trans('ResourceSetup'),$linkback,'title_setup');
 
 $head=resource_admin_prepare_head();
 
-dol_fiche_head($head, 'general', $langs->trans("ResourceSingular"), 0, 'action');
+dol_fiche_head($head, 'general', $langs->trans("ResourceSingular"), -1, 'action');
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
diff --git a/htdocs/admin/resource_extrafields.php b/htdocs/admin/resource_extrafields.php
index 6f8eeaa167e..3d08364a1ed 100644
--- a/htdocs/admin/resource_extrafields.php
+++ b/htdocs/admin/resource_extrafields.php
@@ -74,7 +74,7 @@ print "<br>\n";
 
 $head=resource_admin_prepare_head();
 
-dol_fiche_head($head, 'attributes', $langs->trans("ResourceSingular"), 0, 'action');
+dol_fiche_head($head, 'attributes', $langs->trans("ResourceSingular"), -1, 'action');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
diff --git a/htdocs/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php
index 78cd0af3a12..6ab25c5b57f 100644
--- a/htdocs/core/lib/resource.lib.php
+++ b/htdocs/core/lib/resource.lib.php
@@ -40,7 +40,7 @@ function resource_prepare_head($object)
     	$head[$h][2] = 'resource';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && (empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_USER) || empty($conf->global->RESOURCE_HIDE_ADD_CONTACT_THIPARTY)))
 	{
 	    $nbContact = count($object->liste_contact(-1,'internal')) + count($object->liste_contact(-1,'external'));
 	    $head[$h][0] = DOL_URL_ROOT.'/resource/contact.php?id='.$object->id;
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index c7b835806c8..f5daf6c8d27 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1766,6 +1766,6 @@ MAIN_PDF_MARGIN_BOTTOM=Bottom margin on PDF
 ##### Resource ####
 ResourceSetup=Configuration du module Resource 
 UseSearchToSelectResource=Use a search form to choose a resource (rather than a drop-down list).
-DisabledResourceLinkUser=Disabled resource link to user
-DisabledResourceLinkContact=Disabled resource link to contact
+DisabledResourceLinkUser=Disable feature to link a resource to users
+DisabledResourceLinkContact=Disable feature to link a resource to contacts
 ConfirmUnactivation=Confirm module reset