Changeset 24897

Timestamp:

11/21/08 07:42:05 (7 weeks ago)

Author:

mateo

Message:

fixed #398 Bug in DBUtil updateObjectArray and memory leak on _selectPostProcess plus consistency fixes

Files:

• branches/zikula-1.0/includes/pnobjlib/DBUtil.class.php (modified) (7 diffs)
• development/main/includes/DBUtilManipulation.class.php (modified) (2 diffs)
• development/main/includes/DBUtilSelection.class.php (modified) (5 diffs)
• development/zikula-1/includes/DBUtil.class.php (modified) (7 diffs)

branches/zikula-1.0/includes/pnobjlib/DBUtil.class.php

@@ -617 +617 @@
                 }
 
-                $ak = array_keys ($permissionFilter);
-                foreach ($ak as $k) {   // einmal AK, immer AK ;-)
+                foreach (array_keys($permissionFilter) as $k) {
                     $pf = $permissionFilter[$k];
                     if (!is_array($pf)) {
@@ -1205 +1204 @@
         $count = false;
         if (!$res->EOF) {
-            $count = $res->fields[0];
+            if (isset($res->fields[0])) {
+                $count = $res->fields[0];
+            } else {
+                $count = $res->fields["COUNT($dst $col)"];
+            }
         }
 
@@ -1728 +1731 @@
 
         $res = false;
-        $ak = array_keys ($objects);
-        foreach ($ak as $k) {
+        foreach (array_keys($objects) as $k) {
             $res = DBUtil::insertObject ($objects[$k], $tablename, $idcolumn, $preserve, $force);
             if (!$res) {
@@ -2034 +2036 @@
         }
 
-        $ak = array_keys ($objects);
-        foreach ($ak as $k=>$v) {
+        foreach (array_keys($objects) as $k) {
             $res = DBUtil::updateObject ($objects[$k], $tablename, '', $idcolumn, $force);
             if (!$res) {
@@ -3122 +3123 @@
         $sqlJoin  = '';
         $sqlJoinFieldList = '';
-        $ak = array_keys($joinInfo);
-        foreach ($ak as $k) {
+        foreach (array_keys($joinInfo) as $k) {
             $jt   = $joinInfo[$k]['join_table'];
             $jf   = $joinInfo[$k]['join_field'];
@@ -3222 +3222 @@
                 $ak = array_keys ($objects);
                 if ($ak && is_array($objects[$ak[0]])) {
-                    foreach ($objects as $k=>$v) {
+                    foreach ($ak as $k) {
                         ObjectUtil::expandObjectWithAttributes ($objects[$k], $tablename, $idcolumn);
                     }
@@ -3242 +3242 @@
                 $ak = array_keys ($objects);
                 if ($ak && is_array($objects[$ak[0]])) {
-                    foreach ($objects as $k=>$v) {
+                    foreach ($ak as $k) {
                         ObjectUtil::expandObjectWithMeta ($objects[$k], $tablename, $idcolumn);
                     }

development/main/includes/DBUtilManipulation.class.php

@@ -328 +328 @@
 
         $res = false;
-        $ak = array_keys($objects);
-        foreach ($ak as $k) {
+        foreach (array_keys($objects) as $k) {
             $res = self::insertObject($objects[$k], $tablename, $idcolumn, $preserve, $force);
             if (!$res) {
@@ -355 +354 @@
         }
 
-        $ak = array_keys($objects);
-        foreach ($ak as $k => $v) {
+        foreach (array_keys($objects) as $k) {
             $res = self::updateObject($objects[$k], $tablename, '', $idcolumn, $force);
             if (!$res) {

development/main/includes/DBUtilSelection.class.php

@@ -410 +410 @@
                 }
 
-                $ak = array_keys ($permissionFilter);
-                foreach ($ak as $k) {   // einmal AK, immer AK ;-)
+                foreach (array_keys ($permissionFilter) as $k) {
                     $pf = $permissionFilter[$k];
                     if (!is_array($pf)) {
@@ -1129 +1128 @@
         $count = false;
         if (!$res->EOF) {
-            $count = $res->fields[0];
+            if (isset($res->fields[0])) {
+                $count = $res->fields[0];
+            } else {
+                $count = $res->fields["COUNT($dst $col)"];
+            }
         }
 
@@ -1400 +1403 @@
         $sqlJoin = '';
         $sqlJoinFieldList = '';
-        $ak = array_keys($joinInfo);
-        foreach ($ak as $k) {
+        foreach (array_keys($joinInfo) as $k) {
             $jt  = $joinInfo[$k]['join_table'];
             $jf  = $joinInfo[$k]['join_field'];
@@ -1506 +1508 @@
                 $ak = array_keys ($objects);
                 if ($ak && is_array($objects[$ak[0]])) {
-                    foreach ($objects as $k=>$v) {
+                    foreach ($ak as $k) {
                         ObjectUtil::expandObjectWithAttributes($objects[$k], $tablename, $idcolumn);
                     }
@@ -1525 +1527 @@
                 $ak = array_keys($objects);
                 if ($ak && is_array($objects[$ak[0]])) {
-                    foreach($objects as $k => $v) {
+                    foreach($ak as $k) {
                         ObjectUtil::expandObjectWithMeta($objects[$k], $tablename, $idcolumn);
                     }

development/zikula-1/includes/DBUtil.class.php

@@ -620 +620 @@
                 }
 
-                $ak = array_keys ($permissionFilter);
-                foreach ($ak as $k) {   // einmal AK, immer AK ;-)
+                foreach (array_keys($permissionFilter) as $k) {
                     $pf = $permissionFilter[$k];
                     if (!is_array($pf)) {
@@ -1208 +1207 @@
         $count = false;
         if (!$res->EOF) {
-            $count = $res->fields[0];
+            if (isset($res->fields[0])) {
+                $count = $res->fields[0];
+            } else {
+                $count = $res->fields["COUNT($dst $col)"];
+            }
         }
 
@@ -1731 +1734 @@
 
         $res = false;
-        $ak = array_keys ($objects);
-        foreach ($ak as $k) {
+        foreach (array_keys($objects) as $k) {
             $res = DBUtil::insertObject ($objects[$k], $tablename, $idcolumn, $preserve, $force);
             if (!$res) {
@@ -2037 +2039 @@
         }
 
-        $ak = array_keys ($objects);
-        foreach ($ak as $k=>$v) {
+        foreach (array_keys($objects) as $k) {
             $res = DBUtil::updateObject ($objects[$k], $tablename, '', $idcolumn, $force);
             if (!$res) {
@@ -3124 +3125 @@
         $sqlJoin  = '';
         $sqlJoinFieldList = '';
-        $ak = array_keys($joinInfo);
-        foreach ($ak as $k) {
+        foreach (array_keys($joinInfo) as $k) {
             $jt   = $joinInfo[$k]['join_table'];
             $jf   = $joinInfo[$k]['join_field'];
@@ -3229 +3229 @@
                 $ak = array_keys ($objects);
                 if ($ak && is_array($objects[$ak[0]])) {
-                    foreach ($objects as $k=>$v) {
+                    foreach ($ak as $k) {
                         ObjectUtil::expandObjectWithAttributes ($objects[$k], $tablename, $idcolumn);
                     }
@@ -3249 +3249 @@
                 $ak = array_keys ($objects);
                 if ($ak && is_array($objects[$ak[0]])) {
-                    foreach ($objects as $k=>$v) {
+                    foreach ($ak as $k) {
                         ObjectUtil::expandObjectWithMeta ($objects[$k], $tablename, $idcolumn);
                     }