lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: [ bug #537 ] Fatal error: Using $this when not in object context

Browse Source
This commit is contained in:
Regis Houssin 2012-09-10 14:40:32 +02:00
parent 6162d296ce
commit ba2f986282
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/boxes.php
View File

@ -316,7 +316,7 @@ if ($resql)
// Available boxes // Available boxes
$boxtoadd=InfoBox::listboxes($db,'available',-1,$emptyuser,$actives); $boxtoadd=InfoBox::listBoxes($db,'available',-1,$emptyuser,$actives);
print "<br>\n"; print "<br>\n";
print_titre($langs->trans("BoxesAvailable")); print_titre($langs->trans("BoxesAvailable"));
@ -366,7 +366,7 @@ print '</table>';
// Activated boxes // Activated boxes
$boxactivated=InfoBox::listboxes($db,'activated',-1,$emptyuser); $boxactivated=InfoBox::listBoxes($db,'activated',-1,$emptyuser);
print "<br>\n\n"; print "<br>\n\n";
print_titre($langs->trans("BoxesActivated")); print_titre($langs->trans("BoxesActivated"));

4
htdocs/core/class/html.formother.class.php
View File

@ -809,7 +809,7 @@ class FormOther
include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
//$infobox=new InfoBox($db); //$infobox=new InfoBox($db);
$boxactivated=InfoBox::listboxes($db,'activated',$areacode,$user); $boxactivated=InfoBox::listBoxes($db,'activated',$areacode,$user);
$arrayboxactivatedid=array(); $arrayboxactivatedid=array();
foreach($boxactivated as $box) $arrayboxactivatedid[$box->id]=$box->id; foreach($boxactivated as $box) $arrayboxactivatedid[$box->id]=$box->id;
@ -817,7 +817,7 @@ class FormOther
if (! empty($conf->use_javascript_ajax)) if (! empty($conf->use_javascript_ajax))
{ {
$emptyuser=new User($db); $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(); $arrayboxtoactivatelabel=array();
foreach($boxavailable as $box) foreach($boxavailable as $box)

10
htdocs/core/class/infobox.class.php
View File

@ -137,8 +137,8 @@ class InfoBox
else else
{ {
//dol_print_error($db); //dol_print_error($db);
$this->error=$db->error(); $error=$db->error();
dol_syslog(get_class()."::listBoxes Error ".$this->error, LOG_ERR); dol_syslog(get_class()."::listBoxes Error ".$error, LOG_ERR);
return array(); return array();
} }
@ -231,7 +231,7 @@ class InfoBox
} }
if ($error) if ($error)
{ {
$this->error=$db->error(); $error=$db->error();
$db->rollback(); $db->rollback();
return -2; return -2;
} }
@ -243,9 +243,9 @@ class InfoBox
} }
else else
{ {
$this->error=$db->lasterror(); $error=$db->lasterror();
$db->rollback(); $db->rollback();
dol_syslog(get_class()."::saveboxorder ".$this->error); dol_syslog(get_class()."::saveboxorder ".$error);
return -1; return -1;
} }
} }