From f214c06b1e082dd7414cf515dc51a60471d788fa Mon Sep 17 00:00:00 2001 From: fhenry Date: Tue, 15 Jan 2013 10:20:19 +0100 Subject: [PATCH 1/2] Add option to fecth extrafield even if extranal extrafield module is enabled. Usefull for web service to fetch optionnal from llx_extrafields even if record or update is manage by hook with external module --- htdocs/core/class/extrafields.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 87e3eb5dce7..0b5fd2e90ed 100755 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -431,16 +431,17 @@ class ExtraFields * Load array this->attribute_label * * @param string $elementtype Type of element + * @param boolean $forcecheck override test of MAIN_EXTRAFIELDS_DISABLED * @return array Array of attributes for all extra fields */ - function fetch_name_optionals_label($elementtype='member') + function fetch_name_optionals_label($elementtype='member',$forcecheck=false) { global $conf; $array_name_label=array(); // For avoid conflicts with external modules - if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) + if ((! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) && (!$forcecheck)) return $array_name_label; $sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired"; From 52b4d988496011356a2e19a5c313fda00300cea8 Mon Sep 17 00:00:00 2001 From: fhenry Date: Tue, 15 Jan 2013 11:11:24 +0100 Subject: [PATCH 2/2] remove parenthesis not usefull --- htdocs/core/class/extrafields.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 0b5fd2e90ed..bfced8e176d 100755 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -441,7 +441,7 @@ class ExtraFields $array_name_label=array(); // For avoid conflicts with external modules - if ((! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) && (!$forcecheck)) + if (!empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && !$forcecheck) return $array_name_label; $sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired";