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

Fix: Conflicts with var with same name

Browse Source
This commit is contained in:
Laurent Destailleur 2010-11-08 01:04:55 +00:00
parent a2f4671380
commit 8e00d8c555
7 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dev/skeletons/skeleton_page.php
View File

@ -105,11 +105,11 @@ $form=new Form($db);
****************************************************/ ****************************************************/
$myobject->load_object_linked($myobject->id,$myobject->element); $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);
} }
} }

6
htdocs/commande/fiche.php
View File

@ -1854,11 +1854,11 @@ else
*/ */
$object->load_object_linked($object->id,$object->element); $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);
} }
} }

6
htdocs/compta/commande/fiche.php
View File

@ -580,11 +580,11 @@ if ($id > 0 || ! empty($ref))
*/ */
$commande->load_object_linked($commande->id,$commande->element); $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);
} }
} }

6
htdocs/compta/facture.php
View File

@ -2912,11 +2912,11 @@ else
*/ */
$object->load_object_linked($object->id,$object->element); $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);
} }
} }

6
htdocs/compta/propal.php
View File

@ -512,11 +512,11 @@ if ($id > 0 || ! empty($ref))
*/ */
$propal->load_object_linked($propal->id,$propal->element); $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);
} }
} }

6
htdocs/contrat/fiche.php
View File

@ -1347,11 +1347,11 @@ else
{ {
print '<table width="100%"><tr><td width="50%" valign="top">'; print '<table width="100%"><tr><td width="50%" valign="top">';
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);
} }
} }

4
htdocs/core/class/commonobject.class.php
View File

@ -1333,11 +1333,11 @@ class CommonObject
/** /**
* Show linked object block * 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 $object
* @param $objectid * @param $objectid
* @param $somethingshown * @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) function showLinkedObjectBlock($object,$objectid,$somethingshown=0)
{ {