diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 88b32e02dd9..4002f335f59 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -316,7 +316,7 @@ if ($resql)
// Available boxes
-$boxtoadd=InfoBox::listboxes($db,'available',-1,$emptyuser,$actives);
+$boxtoadd=InfoBox::listBoxes($db,'available',-1,$emptyuser,$actives);
print "
\n";
print_titre($langs->trans("BoxesAvailable"));
@@ -366,7 +366,7 @@ print '';
// Activated boxes
-$boxactivated=InfoBox::listboxes($db,'activated',-1,$emptyuser);
+$boxactivated=InfoBox::listBoxes($db,'activated',-1,$emptyuser);
print "
\n\n";
print_titre($langs->trans("BoxesActivated"));
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index 95da2e01d10..a558d6869a8 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -809,7 +809,7 @@ class FormOther
include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
//$infobox=new InfoBox($db);
- $boxactivated=InfoBox::listboxes($db,'activated',$areacode,$user);
+ $boxactivated=InfoBox::listBoxes($db,'activated',$areacode,$user);
$arrayboxactivatedid=array();
foreach($boxactivated as $box) $arrayboxactivatedid[$box->id]=$box->id;
@@ -817,7 +817,7 @@ class FormOther
if (! empty($conf->use_javascript_ajax))
{
$emptyuser=new User($db);
- $boxavailable=InfoBox::listboxes($db,'activated',$areacode,$emptyuser,$arrayboxactivatedid); // Get list of box available for empty user (minus already activated for user)
+ $boxavailable=InfoBox::listBoxes($db,'activated',$areacode,$emptyuser,$arrayboxactivatedid); // Get list of box available for empty user (minus already activated for user)
$arrayboxtoactivatelabel=array();
foreach($boxavailable as $box)
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index 3d0a0f2d692..7dc2af3b8d1 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -137,8 +137,8 @@ class InfoBox
else
{
//dol_print_error($db);
- $this->error=$db->error();
- dol_syslog(get_class()."::listBoxes Error ".$this->error, LOG_ERR);
+ $error=$db->error();
+ dol_syslog(get_class()."::listBoxes Error ".$error, LOG_ERR);
return array();
}
@@ -231,7 +231,7 @@ class InfoBox
}
if ($error)
{
- $this->error=$db->error();
+ $error=$db->error();
$db->rollback();
return -2;
}
@@ -243,9 +243,9 @@ class InfoBox
}
else
{
- $this->error=$db->lasterror();
+ $error=$db->lasterror();
$db->rollback();
- dol_syslog(get_class()."::saveboxorder ".$this->error);
+ dol_syslog(get_class()."::saveboxorder ".$error);
return -1;
}
}