fix #947 @0.5

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index 703b4c31d923732d2daca50b6a4190ab9021f12a..7ea78a7842c5673d753771525c15fc972ae24991 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -304,7 +304,7 @@ class wsDAOBook extends commonDAO {
                }
                if ($r->count() == 1) {
                        $pages = unserialize($r->composition);
-                       if (!count($pages)) {
+                       if (null===$pages || !count($pages)) {
                                return $this->getPagesOfBook($book_id);
                        }
                        return $pages;
@@ -315,11 +315,18 @@ class wsDAOBook extends commonDAO {
                                if (is_null($pages)) {
                                        return $this->getPagesOfBook($book_id);
                                }
-                               return unserialize($pages);
+                               $res = unserialize($pages);
+                               if (null===$res || !count($res)) {
+                                       return $this->getPagesOfBook($book_id);
+                               }
                        }
                        $pages = $r->composition;
                }
-               return unserialize($pages);
+               $res = unserialize($pages);
+               if (null===$res || !count($res)) {
+                       return $this->getPagesOfBook($book_id);
+               }
+               return $res;
        }
 
        public function getDocumentsToUpdate($book_id) {

diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php
index dc5dce484d15ccb48fb9c53e478e6cc127b9d744..4b493392c7a66d48fc922e2626a4fdd433743dec 100644 (file)
--- a/inc/ws/Util/class.ws.links.php
+++ b/inc/ws/Util/class.ws.links.php
@@ -209,6 +209,7 @@ class wsLinks {
                $daoBook = new wsDAOBook($core->con);
                $pages = $daoBook->getPagesOfBookAt($book_id, $time);
 
+
                foreach ($pages as $p => $infos) {
                        $documents[] = $infos['document_id'];
                }
@@ -221,6 +222,7 @@ class wsLinks {
                $rulers = array();
 
                foreach ($documents as $d) {
+                       echo $d."\n";
                        if (is_null($time)) {
                                $lr = self::getDocumentLastLinks($d);
                        } else {