From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Tue, 15 Nov 2016 12:27:59 +0000 (+0000)
Subject: fix #947 @0.5
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=2f17d7501d54a751c68c65903c094ebd4b431bc6;p=cubeextranet.git

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 703b4c31d..7ea78a784 100644
--- 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 dc5dce484..4b493392c 100644
--- 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 {