wip #2859 @0.25

diff --git a/inc/ws/Controlleur/class.ws.services.php b/inc/ws/Controlleur/class.ws.services.php
index dabc407422bec98cafbfa512c8ae29417b741dc8..e8b711252293eb18d6f833d2332af7809ea60c63 100644 (file)
--- a/inc/ws/Controlleur/class.ws.services.php
+++ b/inc/ws/Controlleur/class.ws.services.php
@@ -378,12 +378,11 @@ class wsServices extends cubeFlashGateway
                        return false;
                }
 
-
                $destDir = WS_CACHE . '/exportpdf/' . $book->cid;
                if (!file_exists($destDir)) {
                        mkdir($destDir, 0777, true);
                }
-               $fname = md5(implode(',%ù', $range)) . '.pdf';
+               $fname = md5($baseDocument) . '-' . md5(implode(',%ù', $range)) . '.pdf';
                $destFile = $destDir . '/' . $fname;
                $destURL = '/fluidbook/cache/exportpdf/' . $book->cid . '/' . $fname;
 
@@ -421,8 +420,6 @@ class wsServices extends cubeFlashGateway
        public function getPDFComplexBaseDocument($book)
        {
                global $core;
-
-
                switch ($book->parametres->bookmarkUsePDF) {
                        case 'download':
                                return WS_BOOKS . '/working/' . $book->book_id . '/' . $book->parametres->pdfReplace;