diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index fc7378ecd93..e8e038f33eb 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -589,9 +589,9 @@ if ($object->id > 0) {
print '';
print '
';
if ($action == 'edittransportmode') {
- $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->transport_mode_id, 'transport_mode_id', 1);
+ $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, (!empty($object->transport_mode_id) ? $object->transport_mode_id : ''), 'transport_mode_id', 1);
} else {
- $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->transport_mode_id, 'none');
+ $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, (!empty($object->transport_mode_id) ? $object->transport_mode_id : ''), 'none');
}
print " | ";
print '';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 33cfa7c8b32..9e312bee679 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6397,7 +6397,7 @@ abstract class CommonObject
$param = array();
$param['options'] = array();
$reg = array();
- $size = $this->fields[$key]['size'];
+ $size = !empty($this->fields[$key]['size']) ? $this->fields[$key]['size'] : 0;
// Because we work on extrafields
if (preg_match('/^(integer|link):(.*):(.*):(.*):(.*)/i', $val['type'], $reg)) {
$param['options'] = array($reg[2].':'.$reg[3].':'.$reg[4].':'.$reg[5] => 'N');
@@ -6430,21 +6430,21 @@ abstract class CommonObject
}
// Special case that force options and type ($type can be integer, varchar, ...)
- if (is_array($this->fields[$key]['arrayofkeyval'])) {
+ if (!empty($this->fields[$key]['arrayofkeyval']) && is_array($this->fields[$key]['arrayofkeyval'])) {
$param['options'] = $this->fields[$key]['arrayofkeyval'];
$type = 'select';
}
$label = $this->fields[$key]['label'];
//$elementtype=$this->fields[$key]['elementtype']; // Seems not used
- $default = $this->fields[$key]['default'];
- $computed = $this->fields[$key]['computed'];
- $unique = $this->fields[$key]['unique'];
- $required = $this->fields[$key]['required'];
- $autofocusoncreate = $this->fields[$key]['autofocusoncreate'];
+ $default = (!empty($this->fields[$key]['default']) ? $this->fields[$key]['default'] : '');
+ $computed = (!empty($this->fields[$key]['computed']) ? $this->fields[$key]['computed'] : '');
+ $unique = (!empty($this->fields[$key]['unique']) ? $this->fields[$key]['unique'] : 0);
+ $required = (!empty($this->fields[$key]['required']) ? $this->fields[$key]['required'] : 0);
+ $autofocusoncreate = (!empty($this->fields[$key]['autofocusoncreate']) ? $this->fields[$key]['autofocusoncreate'] : 0);
- $langfile = $this->fields[$key]['langfile'];
- $list = $this->fields[$key]['list'];
+ $langfile = (!empty($this->fields[$key]['langfile']) ? $this->fields[$key]['langfile'] : '');
+ $list = (!empty($this->fields[$key]['list']) ? $this->fields[$key]['list'] : 0);
$hidden = (in_array(abs($this->fields[$key]['visible']), array(0, 2)) ? 1 : 0);
$objectid = $this->id;
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index dda350865af..0944918f815 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -8325,10 +8325,10 @@ class Form
$nophoto = 'company';
} else {
$nophoto = '/public/theme/common/user_anonymous.png';
- if ($object->gender == 'man') {
+ if (!empty($object->gender) && $object->gender == 'man') {
$nophoto = '/public/theme/common/user_man.png';
}
- if ($object->gender == 'woman') {
+ if (!empty($object->gender) && $object->gender == 'woman') {
$nophoto = '/public/theme/common/user_woman.png';
}
}
diff --git a/htdocs/langs/en_US/knowledgemanagement.lang b/htdocs/langs/en_US/knowledgemanagement.lang
index 269007e60f8..68f5cced76c 100644
--- a/htdocs/langs/en_US/knowledgemanagement.lang
+++ b/htdocs/langs/en_US/knowledgemanagement.lang
@@ -47,7 +47,7 @@ KnowledgeManagementArea = Knowledge Management
# Menu
#
MenuKnowledgeRecord = Knowledge base
-ListOfArticles = List of articles
+ListKnowledgeRecord = List of articles
NewKnowledgeRecord = New article
ValidateReply = Validate solution
KnowledgeRecords = Articles