Changeset 85762 in spip-zone

Timestamp:

Oct 31, 2014, 1:17:28 PM (5 years ago)

Author:

severo@…

Message:

Report de c21764 - fixes #3325

File:

• _plugins_/iterateurs/iterateur/data.php (modified) (3 diffs)

_plugins_/iterateurs/iterateur/data.php

@@ -420 +420 @@
  */
 function inc_xml_to_array_dist($u) {
-        return @ObjectToArray(new SimpleXmlIterator($u));
+        return @XMLObjectToArray(new SimpleXmlIterator($u));
+}
+/**
+ *
+ * object -> tableau
+ *
+ * @param  object $object The object to convert
+ * @return array
+ *
+ */
+function inc_object_to_array( $object ) {
+        if( !is_object( $object ) && !is_array( $object ) ) {
+                return $object;
+        }
+        if( is_object( $object ) ) {
+                $object = get_object_vars( $object );
+        }
+        return array_map( 'inc_object_to_array', $object );
 }
 
@@ -437 +454 @@
                 return false;
         }
-        return (array) $w;
+        return inc_object_to_array($w);
 }
 
@@ -570 +587 @@
  * @return array|bool
  */
-function ObjectToArray($object){
+function XMLObjectToArray($object){
         $xml_array = array();
         for( $object->rewind(); $object->valid(); $object->next() ) {