claunia/qemudb
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version: Properly merge arrays in objectGetChildren()

Browse Source
This commit is contained in:
Alexander Nicolaysen Sørnes
2009-08-06 18:40:20 +02:00
parent 68b9a2b69e
commit 19c34f5f2e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/version.php
View File

@@ -1727,7 +1727,7 @@ class version {
foreach($this->getTestResults($bIncludeDeleted) as $oTest) foreach($this->getTestResults($bIncludeDeleted) as $oTest)
{ {
if($bRecursive) if($bRecursive)
$aChildren += $oTest->objectGetChildren($bIncludeDeleted); $aChildren = array_merge($aChildren, $oTest->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oTest; $aChildren[] = $oTest;
} }
@@ -1743,7 +1743,7 @@ class version {
$oMaintainer = new maintainer(0, $oRow); $oMaintainer = new maintainer(0, $oRow);
if($bRecursive) if($bRecursive)
$aChildren += $oMaintainer->objectGetChildren($bIncludeDeleted); $aChildren = array_merge($aChildren, $oMaintainer->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oMaintainer; $aChildren[] = $oMaintainer;
} }
@@ -1759,7 +1759,7 @@ class version {
$oMonitor = new monitor(0, $oRow); $oMonitor = new monitor(0, $oRow);
if($bRecursive) if($bRecursive)
$aChildren += $oMonitor->objectGetChildren($bIncludeDeleted); $aChildren = array_merge($aChildren, $oMonitor->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oMonitor; $aChildren[] = $oMonitor;
} }
@@ -1791,7 +1791,7 @@ class version {
$oScreenshot = new screenshot(0, $oRow); $oScreenshot = new screenshot(0, $oRow);
if($bRecursive) if($bRecursive)
$aChildren += $oScreenshot->objectGetChildren($bIncludeDeleted); $aChildren = array_merge($aChildren, $oScreenshot->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oScreenshot; $aChildren[] = $oScreenshot;
} }
@@ -1801,7 +1801,7 @@ class version {
$oBug = new bug($iBugId); $oBug = new bug($iBugId);
if($bRecursive) if($bRecursive)
$aChildren += $oBug->objectGetChildren($bIncludeDeleted); $aChildren = array_merge($aChildren, $oBug->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oBug; $aChildren[] = $oBug;
} }
@@ -1832,7 +1832,7 @@ class version {
$oUrl = new url(0, $oRow); $oUrl = new url(0, $oRow);
if($bRecursive) if($bRecursive)
$aChildren += $oUrl->objectGetChildren($bIncludeDeleted); $aChildren = array_merge($aChildren, $oUrl->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oUrl; $aChildren[] = $oUrl;
} }
@@ -1848,12 +1848,12 @@ class version {
$oDownload = new downloadurl(0, $oRow); $oDownload = new downloadurl(0, $oRow);
if($bRecursive) if($bRecursive)
$aChildren += $oDownload->objectGetChildren($bIncludeDeleted); $aChildren = array_merge($aChildren, $oDownload->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oDownload; $aChildren[] = $oDownload;
} }
/* Get votes, include deleted ones */ /* Get votes, include deleted ones */
$aChildren += vote::getVotesForVersion($this->iVersionId); $aChildren = array_merge($aChildren, vote::getVotesForVersion($this->iVersionId));
return $aChildren; return $aChildren;
} }