[xoops-svn] SF.net SVN: xoops:[10196] XoopsCore/branches/2.6.x/2.6.0/htdocs

[<du...@us...>]

Revision: 10196
          http://xoops.svn.sourceforge.net/xoops/?rev=10196&view=rev
Author:   dugris
Date:     2012-10-05 10:58:19 +0000 (Fri, 05 Oct 2012)
Log Message:
-----------
Keep toArray() function for the compatibility of modules, and customization of classes

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php	2012-10-03 04:31:55 UTC (rev 10195)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/joint.php	2012-10-05 10:58:19 UTC (rev 10196)
@@ -117,7 +117,7 @@
             $object = $this->handler->create(false);
             while ($myrow = $this->handler->db->fetchArray($result)) {
                 $object->assignVars($myrow);
-                $ret[$myrow[$this->handler->keyName]] = $object->getValues(array_keys($myrow));
+                $ret[$myrow[$this->handler->keyName]] = $object->toArray();
             }
             unset($object);
         }

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php	2012-10-03 04:31:55 UTC (rev 10195)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/class/model/read.php	2012-10-05 10:58:19 UTC (rev 10196)
@@ -87,9 +87,9 @@
             while ($myrow = $this->handler->db->fetchArray($result)) {
                 $object->assignVars($myrow);
                 if ($id_as_key) {
-                    $ret[$myrow[$this->handler->keyName]] = $object->getValues(array_keys($myrow));
+                    $ret[$myrow[$this->handler->keyName]] = $object->toArray();
                 } else {
-                    $ret[] = $object->getValues(array_keys($myrow));
+                    $ret[] = $object->toArray();
                 }
             }
             unset($object);

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php	2012-10-03 04:31:55 UTC (rev 10195)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/kernel/object.php	2012-10-05 10:58:19 UTC (rev 10196)
@@ -697,6 +697,11 @@
         }
         return $ret;
     }
+
+    public function toArray()
+    {
+        return $this->getValues();
+    }
 }
 
 /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.