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

Fix: Bad merge

Browse Source
This commit is contained in:
Laurent Destailleur 2012-07-13 12:23:17 +02:00
parent b801a391a4
commit 9327858bee
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1654,21 +1654,8 @@ abstract class CommonObject
$sql.= " WHERE "; $sql.= " WHERE ";
if ($justsource || $justtarget) if ($justsource || $justtarget)
{ {
<<<<<<< OURS
if ($justsource) $sql.= "fk_source = '".$sourceid."' AND sourcetype = '".$sourcetype."'"; if ($justsource) $sql.= "fk_source = '".$sourceid."' AND sourcetype = '".$sourcetype."'";
if ($justtarget) $sql.= "fk_target = '".$targetid."' AND targettype = '".$targettype."'"; if ($justtarget) $sql.= "fk_target = '".$targetid."' AND targettype = '".$targettype."'";
=======
if ($justsource)
{
$sql.= "fk_source = '".$sourceid."' AND sourcetype = '".$sourcetype."'";
if ($withtargettype) $sql.= " AND targettype = '".$targettype."'";
}
else if ($justtarget)
{
$sql.= "fk_target = '".$targetid."' AND targettype = '".$targettype."'";
if ($withsourcetype) $sql.= " AND sourcetype = '".$sourcetype."'";
}
>>>>>>> THEIRS
} }
else else
{ {