(no commit message)

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 083a865282324d34cc70eeef2962d2a28536b673..2838b8553cd702530e4e86782a353c8155d667ae 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -43,8 +43,8 @@ class wsMaintenance {
                        $c->document_id = $document_id;\r
                        foreach($updates as $date => $dummy) {\r
                                $c->update = $date;\r
-                               $c->links = serialize($d[$document_id][$date]['links']);\r
-                               $c->rulers = serialize($d[$document_id][$date]['rulers']);\r
+                               $c->links = json_encode($d[$document_id][$date]['links']);\r
+                               $c->rulers = json_encode($d[$document_id][$date]['rulers']);\r
                                try {\r
                                        $c->insert();\r
                                }\r

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index dff100b60bc6145d44cbf6f0baf3ae9e9642b1c3..b362f816d9cd1cc1bda832610505f16bc70d0ca4 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -256,12 +256,20 @@ class wsDAODocument extends commonDAO {
                $tlinks = array();\r
                $trulers = array();\r
 \r
+               $links=array();\r
+               $rulers=array();\r
+\r
                foreach($documents as $d) {\r
                        $r = $this->con->select('SELECT * FROM document_links_versions WHERE document_id=' . $d . ' ORDER BY `update` DESC LIMIT 1');\r
+                       fb($r->links);\r
+                       fb($r->rulers);\r
                        $tlinks[$d] = json_decode($r->links, true);\r
                        $trulers[$d] = json_decode($r->rulers, true);\r
                }\r
 \r
+               fb($tlinks);\r
+               fb($trulers);\r
+\r
                $i = 1;\r
                foreach ($pages as $p => $infos) {\r
                        if (isset($tlinks[$infos['document_id']][$infos['document_page']])) {\r