wait #3411 @0:10

diff --git a/inc/commons/class.common.tools.php b/inc/commons/class.common.tools.php
index 7f048ea7b1e027d1e3998c8fa1896b49a9cd5feb..d5866d9cf43334a6f68539713b0bde599c693e45 100644 (file)
--- a/inc/commons/class.common.tools.php
+++ b/inc/commons/class.common.tools.php
@@ -1574,7 +1574,7 @@ class commonTools
         // Handle zip upload
         $uploaded = new ZipArchive();
         $uploaded->open($_FILES['file']['tmp_name']);
-        $data = simplexml_load_string(str_replace('&', '&', $uploaded->getFromName('data.xml')));
+        $data = simplexml_load_string(str_replace('&', '&', $uploaded->getFromName('data.xml')), 'SimpleXMLElement', LIBXML_NOCDATA);
         if (!$data) {
             return self::ipGlobal(__('Erreur lors de l\'analyse du fichier XML'));
         }
@@ -1603,7 +1603,7 @@ class commonTools
                     file_put_contents($repos . '/images/' . $image, $imagecontent);
                 }
                 $html .= '<img src="images/' . $image . '" alt="' . $title . '" id="image-' . $id . '" usemap="#map-' . $id . '">';
-                $html .= '<map name="map-' . $id . '">' . $shelf->map->asXML() . '</map>';
+                $html .= '<map name="map-' . $id . '">' . (string)$shelf->map . '</map>';
                 $html .= '</div>';
             }
             $html .= '</div>';