Alexander Nicolaysen Sørnes : Fix objectGetCustomVars
Chris Morgan
cmorgan at winehq.org
Thu Sep 20 20:30:35 CDT 2007
Module: appdb
Branch: master
Commit: fdfe3eb2d3c24a319a7a809807c8410b72294a91
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fdfe3eb2d3c24a319a7a809807c8410b72294a91
Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date: Thu Sep 20 08:33:00 2007 +0200
Fix objectGetCustomVars
---
include/objectManager.php | 11 ++++++-----
include/version.php | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/objectManager.php b/include/objectManager.php
index c52d36a..b75c879 100644
--- a/include/objectManager.php
+++ b/include/objectManager.php
@@ -736,14 +736,15 @@ class ObjectManager
return null; /* No vars */
$aVars = array();
+ $aVarNames = $oObject->objectGetCustomVars($sAction);
- foreach($oObject->objectGetCustomVars($aClean, $sAction) as $sVar)
+ if(!$aVarNames) /* No vars */
+ return null;
+
+ foreach($aVarNames as $sVar)
$aVars[$sVar] = $aClean[$sVar];
- if(!sizeof($aVars))
- return null; /* No vars */
- else
- return $aVars;
+ return $aVars;
}
/* View an entry */
diff --git a/include/version.php b/include/version.php
index 6d74736..7ba53d4 100644
--- a/include/version.php
+++ b/include/version.php
@@ -731,7 +731,7 @@ class version {
}
}
- function objectGetCustomVars($aClean, $sAction)
+ function objectGetCustomVars($sAction)
{
switch($sAction)
{
More information about the wine-cvs
mailing list