From bb056fc811abadcf13fba3cb62fcb73b4f702667 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 10 Jul 2020 03:02:49 +0200
Subject: [PATCH] Fix bad return value

---
 htdocs/core/class/commonobject.class.php | 14 +++++++++-----
 htdocs/core/class/hookmanager.class.php  |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 49deacab01b..6951a4df476 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6715,12 +6715,12 @@ abstract class CommonObject
 
 		if (!is_object($form)) $form = new Form($db);
 
+		$out = '';
+
 		$parameters=array();
 		$reshook=$hookmanager->executeHooks('showOptionals',$parameters,$this,$action); // Note that $action and $object may have been modified by hook
 		if (empty($reshook))
 		{
-			$out = '';
-
 			if (is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0)
 			{
 				$out .= "\n";
@@ -6942,11 +6942,15 @@ abstract class CommonObject
 							setListDependencies();
 					    });
 					</script>'."\n";
-					$out .= '<!-- /showOptionalsInput --> '."\n";
 				}
+
+				$out .= '<!-- /showOptionalsInput --> '."\n";
 			}
-			return $out;
-		} // end of hook manager
+		}
+
+		$out .= $hookmanager->resPrint;
+
+		return $out;
 	}
 
 
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 97c45e2f926..089e9fb6717 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -207,6 +207,7 @@ class HookManager
 				'restrictedArea',
 				'sendMail',
 				'sendMailAfter',
+				'showOptionals',
 				'showLinkToObjectBlock',
 				'setContentSecurityPolicy',
 				'setHtmlTitle',