mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-09 02:58:23 +01:00
fix warning
This commit is contained in:
@@ -1985,7 +1985,7 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
|
|||||||
global $conf, $langs;
|
global $conf, $langs;
|
||||||
|
|
||||||
if ($tzoutput === 'auto') {
|
if ($tzoutput === 'auto') {
|
||||||
$tzoutput = (empty($conf) ? 'tzserver' : $conf->tzuserinputkey);
|
$tzoutput = (empty($conf) ? 'tzserver' : (isset($conf->tzuserinputkey)?$conf->tzuserinputkey:'tzserver'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clean parameters
|
// Clean parameters
|
||||||
|
|||||||
@@ -46,7 +46,6 @@ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object,
|
|||||||
print $hookmanager->resPrint;
|
print $hookmanager->resPrint;
|
||||||
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
|
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
|
||||||
|
|
||||||
|
|
||||||
//var_dump($extrafields->attributes[$object->table_element]);
|
//var_dump($extrafields->attributes[$object->table_element]);
|
||||||
if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label']))
|
if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label']))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -708,6 +708,7 @@ class Project extends CommonObject
|
|||||||
/* Return array even if empty*/
|
/* Return array even if empty*/
|
||||||
return $elements;
|
return $elements;
|
||||||
} else {
|
} else {
|
||||||
|
//$this->error = $this->db->error;
|
||||||
dol_print_error($this->db);
|
dol_print_error($this->db);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user