From a0bed6c47f847933255d92c58edf8f1142f29138 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Mon, 3 Dec 2012 17:29:08 +0100 Subject: [PATCH] Fix: For avoid conflicts with external modules --- htdocs/core/class/extrafields.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 381a6f1b34d..a5668597db7 100755 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -42,7 +42,7 @@ class ExtraFields var $attribute_unique; // Array to store if attribute is required or not var $attribute_required; - + var $error; var $errno; @@ -439,6 +439,10 @@ class ExtraFields $array_name_label=array(); + // For avoid conflicts with external modules + if (! empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) + return $array_name_label; + $sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired"; $sql.= " FROM ".MAIN_DB_PREFIX."extrafields"; $sql.= " WHERE entity = ".$conf->entity;