From ce187550f663c62187d50a30a8811218f38a5026 Mon Sep 17 00:00:00 2001
From: odain <olivier.dain@combodo.com>
Date: Thu, 12 Dec 2024 12:21:48 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B07750=20-=20Fix=20display=20regression?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/menunode.class.inc.php |  2 +-
 core/attributedef.class.inc.php    | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php
index 81927e921..32a039e18 100644
--- a/application/menunode.class.inc.php
+++ b/application/menunode.class.inc.php
@@ -1163,7 +1163,7 @@ class OQLMenuNode extends MenuNode
 		$sIcon = MetaModel::GetClassIcon($sClass, false);
 		if ($bSearchPane) {
 			$aParams = array_merge(['open' => $bSearchOpen, 'table_id' => $sUsageId, 'submit_on_load' => false], $aExtraParams);
-			$oBlock = new DisplayBlock($oSearch, DisplayBlock::ENUM_STYLE_LIST_SEARCH, false /* Asynchronous */, $aParams);
+			$oBlock = new DisplayBlock($oSearch, DisplayBlock::ENUM_STYLE_SEARCH, false /* Asynchronous */, $aParams);
 			$oBlock->Display($oPage, 0);
 			$oPage->add("<div class='sf_results_area ibo-add-margin-top-250' data-target='search_results'>");
 		}
diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index d94843364..26e3095b2 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -1715,8 +1715,8 @@ class AttributeLinkedSet extends AttributeDefinition
 	public function GetEditMode()
 	{
 		return $this->GetOptional('edit_mode', LINKSET_EDITMODE_ACTIONS);
-	}	
-	
+	}
+
 	/**
 	 * @return int see LINKSET_EDITWHEN_* constants
 	 * @since 3.1.1 3.2.0 N°6385
@@ -1758,7 +1758,7 @@ class AttributeLinkedSet extends AttributeDefinition
 	{
 		return $this->GetOptional('with_php_computation', false);
 	}
-	
+
 	public function GetLinkedClass()
 	{
 		return $this->Get('linked_class');
@@ -9433,8 +9433,13 @@ class AttributeStopWatch extends AttributeDefinition
 							case 'deadline':
 								if ($value)
 								{
-									$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
-									$sRet = AttributeDeadline::FormatDeadline($sDate);
+									if (is_int($value))
+									{
+										$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
+										$sRet = AttributeDeadline::FormatDeadline($sDate);
+									} else {
+										$sRet = $value;
+									}
 								}
 								else
 								{