(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php
index b362f816d9cd1cc1bda832610505f16bc70d0ca4..81454ee6adf31bf5739d39c99358d9bfb70e3615 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.document.php
+++ b/inc/ws/DAO/class.ws.dao.document.php
@@ -222,7 +222,7 @@ class wsDAODocument extends commonDAO {
                        }\r
                        if (isset($lpages[$p])) {\r
                                $links[$infos['document_id']][$infos['document_page']] = $lpages[$p];\r
-                               //fb($lpages[$p]);\r
+                               // fb($lpages[$p]);\r
                        }\r
                }\r
 \r
@@ -256,25 +256,29 @@ class wsDAODocument extends commonDAO {
                $tlinks = array();\r
                $trulers = array();\r
 \r
-               $links=array();\r
-               $rulers=array();\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
+                       if (mb_substr($r->links, 1, 1) == ':') {\r
+                               $ll = unserialize($r->links);\r
+                               $rr = unserialize($r->rulers);\r
+                       } else {\r
+                               $ll = json_decode($r->links, true);\r
+                               $rr = json_decode($r->rulers, true);\r
+                       }\r
+                       $tlinks[$d] = $ll;\r
+                       $trulers[$d] = $rr;\r
+               }\r
 \r
                $i = 1;\r
                foreach ($pages as $p => $infos) {\r
                        if (isset($tlinks[$infos['document_id']][$infos['document_page']])) {\r
                                $l = $tlinks[$infos['document_id']][$infos['document_page']];\r
                                foreach($l as $link) {\r
+                                       $link=(array)$link;\r
                                        $link['page'] = $p;\r
                                        $links[] = $link;\r
                                }\r