From 7a61d1840e5ed91354f1b588d7d4faf6edf707d8 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Mon, 18 Apr 2011 12:13:45 +0000 Subject: [PATCH] --- inc/ws/Controlleur/class.ws.maintenance.php | 4 ++-- inc/ws/DAO/class.ws.dao.document.php | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php index 083a86528..2838b8553 100644 --- 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; foreach($updates as $date => $dummy) { $c->update = $date; - $c->links = serialize($d[$document_id][$date]['links']); - $c->rulers = serialize($d[$document_id][$date]['rulers']); + $c->links = json_encode($d[$document_id][$date]['links']); + $c->rulers = json_encode($d[$document_id][$date]['rulers']); try { $c->insert(); } diff --git a/inc/ws/DAO/class.ws.dao.document.php b/inc/ws/DAO/class.ws.dao.document.php index dff100b60..b362f816d 100644 --- 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(); $trulers = array(); + $links=array(); + $rulers=array(); + foreach($documents as $d) { $r = $this->con->select('SELECT * FROM document_links_versions WHERE document_id=' . $d . ' ORDER BY `update` DESC LIMIT 1'); + fb($r->links); + fb($r->rulers); $tlinks[$d] = json_decode($r->links, true); $trulers[$d] = json_decode($r->rulers, true); } + fb($tlinks); + fb($trulers); + $i = 1; foreach ($pages as $p => $infos) { if (isset($tlinks[$infos['document_id']][$infos['document_page']])) { -- 2.39.5