From f2ff443641b4d45fde0d0baf0d2de82cbacfaecd Mon Sep 17 00:00:00 2001
From: Nicolas <info@inovea-conseil.com>
Date: Sat, 30 Nov 2019 20:04:27 +0100
Subject: [PATCH] FIX #12482

---
 htdocs/core/lib/functions.lib.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 8d301275b5e..d0bcead2eb9 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -14,6 +14,7 @@
  * Copyright (C) 2014-2015	Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2015		Jean-François Ferry			<jfefe@aternatik.fr>
  * Copyright (C) 2018       Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2019       Nicolas ZABOURI             <info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -6085,7 +6086,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey=0, $exclude=null, $ob
 					if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
 					{
 						foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {
-							$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];
+							$value = $object->array_options['options_' . $key];
+							$substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__']	= $extrafields->showOutputField($key, $value);
 						}
 					}
 				}