diff --git a/dev/skeletons/skeleton_page.php b/dev/skeletons/skeleton_page.php index f375a5e6542..3fd7a5eec98 100644 --- a/dev/skeletons/skeleton_page.php +++ b/dev/skeletons/skeleton_page.php @@ -105,11 +105,11 @@ $form=new Form($db); ****************************************************/ $myobject->load_object_linked($myobject->id,$myobject->element); -foreach($myobject->linked_object as $object => $objectid) +foreach($myobject->linked_object as $linked_object => $linked_objectid) { - if($conf->$object->enabled) + if ($conf->$linked_object->enabled) { - $somethingshown=$myobject->showLinkedObjectBlock($object,$objectid,$somethingshown); + $somethingshown=$myobject->showLinkedObjectBlock($linked_object,$linked_objectid,$somethingshown); } } diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 88ce0ef4c69..1586e47b58c 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1854,11 +1854,11 @@ else */ $object->load_object_linked($object->id,$object->element); - foreach($object->linked_object as $object => $objectid) + foreach($object->linked_object as $linked_object => $linked_objectid) { - if($conf->$object->enabled && $object != $object->element) + if($conf->$linked_object->enabled && $linked_object != $object->element) { - $somethingshown=$object->showLinkedObjectBlock($object,$objectid,$somethingshown); + $somethingshown=$object->showLinkedObjectBlock($linked_object,$linked_objectid,$somethingshown); } } diff --git a/htdocs/compta/commande/fiche.php b/htdocs/compta/commande/fiche.php index a4d2fe31c50..713f11e384c 100644 --- a/htdocs/compta/commande/fiche.php +++ b/htdocs/compta/commande/fiche.php @@ -580,11 +580,11 @@ if ($id > 0 || ! empty($ref)) */ $commande->load_object_linked($commande->id,$commande->element); - foreach($commande->linked_object as $object => $objectid) + foreach($commande->linked_object as $linked_object => $linked_objectid) { - if($conf->$object->enabled && $object != $commande->element) + if($conf->$linked_object->enabled && $linked_object != $commande->element) { - $somethingshown=$commande->showLinkedObjectBlock($object,$objectid,$somethingshown); + $somethingshown=$commande->showLinkedObjectBlock($linked_object,$linked_objectid,$somethingshown); } } diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index ef899a4ca33..86ef099895a 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2912,11 +2912,11 @@ else */ $object->load_object_linked($object->id,$object->element); - foreach($object->linked_object as $objecttype => $objectid) + foreach($object->linked_object as $linked_object => $linked_objectid) { - if($conf->$objecttype->enabled && $objecttype != $object->element) + if($conf->$linked_object->enabled && $linked_object != $object->element) { - $somethingshown=$object->showLinkedObjectBlock($objecttype,$objectid,$somethingshown); + $somethingshown=$object->showLinkedObjectBlock($linked_object,$linked_objectid,$somethingshown); } } diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index 442db0a0f5b..ef1b91ed9a6 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -512,11 +512,11 @@ if ($id > 0 || ! empty($ref)) */ $propal->load_object_linked($propal->id,$propal->element); - foreach($propal->linked_object as $object => $objectid) + foreach($propal->linked_object as $linked_object => $linked_objectid) { - if($conf->$object->enabled && $object != $propal->element) + if($conf->$linked_object->enabled && $linked_object != $propal->element) { - $somethingshown=$propal->showLinkedObjectBlock($object,$objectid,$somethingshown); + $somethingshown=$propal->showLinkedObjectBlock($linked_object,$linked_objectid,$somethingshown); } } diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 3fa7522c6fd..2ac226043ee 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -1347,11 +1347,11 @@ else { print '
'; - foreach($contrat->linked_object as $object => $objectid) + foreach($contrat->linked_object as $linked_object => $linked_objectid) { - if($conf->$object->enabled && $object != $contrat->element) + if($conf->$linked_object->enabled && $linked_object != $contrat->element) { - $somethingshown=$contrat->showLinkedObjectBlock($object,$objectid,$somethingshown); + $somethingshown=$contrat->showLinkedObjectBlock($linked_object,$linked_objectid,$somethingshown); } } diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 19f47a36862..6cf2417139b 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -1333,11 +1333,11 @@ class CommonObject /** * Show linked object block + * TODO This must be moved into a html.class file instead of a business class. + * But for the moment we don't know if it'st possible as we keep a method available on overloaded objects. * @param $object * @param $objectid * @param $somethingshown - * TODO This must be moved into a html.class file instead of a business class. - * But for the moment we don't know if it'st possible as we keep a method available on overloaded objects. */ function showLinkedObjectBlock($object,$objectid,$somethingshown=0) {