Alexander Nicolaysen Sørnes : version: Properly merge arrays in objectGetChildren()
Alexander Nicolaysen Sørnes
asornes at winehq.org
Thu Aug 6 11:40:47 CDT 2009
Module: appdb
Branch: master
Commit: 19c34f5f2e0d89822d8f65415e41c904a17c14a5
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=19c34f5f2e0d89822d8f65415e41c904a17c14a5
Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date: Thu Aug 6 18:40:20 2009 +0200
version: Properly merge arrays in objectGetChildren()
---
include/version.php | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/version.php b/include/version.php
index acf2764..6af2864 100644
--- a/include/version.php
+++ b/include/version.php
@@ -1727,7 +1727,7 @@ class version {
foreach($this->getTestResults($bIncludeDeleted) as $oTest)
{
if($bRecursive)
- $aChildren += $oTest->objectGetChildren($bIncludeDeleted);
+ $aChildren = array_merge($aChildren, $oTest->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oTest;
}
@@ -1743,7 +1743,7 @@ class version {
$oMaintainer = new maintainer(0, $oRow);
if($bRecursive)
- $aChildren += $oMaintainer->objectGetChildren($bIncludeDeleted);
+ $aChildren = array_merge($aChildren, $oMaintainer->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oMaintainer;
}
@@ -1759,7 +1759,7 @@ class version {
$oMonitor = new monitor(0, $oRow);
if($bRecursive)
- $aChildren += $oMonitor->objectGetChildren($bIncludeDeleted);
+ $aChildren = array_merge($aChildren, $oMonitor->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oMonitor;
}
@@ -1791,7 +1791,7 @@ class version {
$oScreenshot = new screenshot(0, $oRow);
if($bRecursive)
- $aChildren += $oScreenshot->objectGetChildren($bIncludeDeleted);
+ $aChildren = array_merge($aChildren, $oScreenshot->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oScreenshot;
}
@@ -1801,7 +1801,7 @@ class version {
$oBug = new bug($iBugId);
if($bRecursive)
- $aChildren += $oBug->objectGetChildren($bIncludeDeleted);
+ $aChildren = array_merge($aChildren, $oBug->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oBug;
}
@@ -1832,7 +1832,7 @@ class version {
$oUrl = new url(0, $oRow);
if($bRecursive)
- $aChildren += $oUrl->objectGetChildren($bIncludeDeleted);
+ $aChildren = array_merge($aChildren, $oUrl->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oUrl;
}
@@ -1848,12 +1848,12 @@ class version {
$oDownload = new downloadurl(0, $oRow);
if($bRecursive)
- $aChildren += $oDownload->objectGetChildren($bIncludeDeleted);
+ $aChildren = array_merge($aChildren, $oDownload->objectGetChildren($bIncludeDeleted));
$aChildren[] = $oDownload;
}
/* Get votes, include deleted ones */
- $aChildren += vote::getVotesForVersion($this->iVersionId);
+ $aChildren = array_merge($aChildren, vote::getVotesForVersion($this->iVersionId));
return $aChildren;
}
More information about the wine-cvs
mailing list