Merge pull request #18178 from defrance/patch-171
PHP V8 warning error, use of not declared array
This commit is contained in:
commit
2a19c02f19
@ -1263,7 +1263,12 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
|
|||||||
if (is_array($this->boxes)) {
|
if (is_array($this->boxes)) {
|
||||||
foreach ($this->boxes as $key => $value) {
|
foreach ($this->boxes as $key => $value) {
|
||||||
//$titre = $this->boxes[$key][0];
|
//$titre = $this->boxes[$key][0];
|
||||||
$file = $this->boxes[$key]['file'];
|
if (empty($this->boxes[$key]['file'])) {
|
||||||
|
$file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
|
||||||
|
} else {
|
||||||
|
$file = $this->boxes[$key]['file'];
|
||||||
|
}
|
||||||
|
|
||||||
//$note = $this->boxes[$key][2];
|
//$note = $this->boxes[$key][2];
|
||||||
|
|
||||||
// TODO If the box is also included by another module and the other module is still on, we should not remove it.
|
// TODO If the box is also included by another module and the other module is still on, we should not remove it.
|
||||||
@ -1276,10 +1281,6 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($file)) {
|
|
||||||
$file = isset($this->boxes[$key][1]) ? $this->boxes[$key][1] : ''; // For backward compatibility
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($this->db->type == 'sqlite3') {
|
if ($this->db->type == 'sqlite3') {
|
||||||
// sqlite doesn't support "USING" syntax.
|
// sqlite doesn't support "USING" syntax.
|
||||||
// TODO: remove this dependency.
|
// TODO: remove this dependency.
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user