Fix warning
This commit is contained in:
parent
c1d12846f0
commit
f251e92eaa
@ -498,7 +498,10 @@ if ($mode == 'feature') {
|
|||||||
if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes)) {
|
if (isset($objMod->boxes) && is_array($objMod->boxes) && count($objMod->boxes)) {
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach ($objMod->boxes as $val) {
|
foreach ($objMod->boxes as $val) {
|
||||||
$text .= ($i ? ', ' : '').($val['file'] ? $val['file'] : $val[0]);
|
$boxstring = (empty($val['file']) ? (empty($val[0]) ? '' : $val[0]) : $val['file']);
|
||||||
|
if ($boxstring) {
|
||||||
|
$text .= ($i ? ', ' : '').$boxstring;
|
||||||
|
}
|
||||||
$i++;
|
$i++;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@ -976,8 +976,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
|
|||||||
$tmp = json_decode($obj->note, true);
|
$tmp = json_decode($obj->note, true);
|
||||||
}
|
}
|
||||||
return array(
|
return array(
|
||||||
'authorid' => $tmp['authorid'],
|
'authorid' => empty($tmp['authorid']) ? '' : $tmp['authorid'],
|
||||||
'ip' => $tmp['ip'],
|
'ip' => empty($tmp['ip']) ? '' : $tmp['ip'],
|
||||||
'lastactivationdate' => $this->db->jdate($obj->tms),
|
'lastactivationdate' => $this->db->jdate($obj->tms),
|
||||||
'lastactivationversion' => (!empty($tmp['lastactivationversion']) ? $tmp['lastactivationversion'] : 'unknown'),
|
'lastactivationversion' => (!empty($tmp['lastactivationversion']) ? $tmp['lastactivationversion'] : 'unknown'),
|
||||||
);
|
);
|
||||||
|
|||||||
@ -46,9 +46,6 @@ if (!defined('NOLOGIN')) {
|
|||||||
if (!defined('NOCSRFCHECK')) {
|
if (!defined('NOCSRFCHECK')) {
|
||||||
define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
|
define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
|
||||||
}
|
}
|
||||||
if (!defined('NOIPCHECK')) {
|
|
||||||
define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
|
|
||||||
}
|
|
||||||
if (!defined('NOBROWSERNOTIF')) {
|
if (!defined('NOBROWSERNOTIF')) {
|
||||||
define('NOBROWSERNOTIF', '1');
|
define('NOBROWSERNOTIF', '1');
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user