wip #5991

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index fec0cc9b59ab9018aba3b95182074a27b963a62d..f970a59a7ee70ab9587e4856b4be36fe2fd80055 100644 (file)
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -440,7 +440,7 @@ class wsDocument extends cubeMetier
         $this->getFilesData();
         $cacheKey = md5($page . '||' . $format . '$$' . $quality . '//' . $resolution . '""' . ($withText ? '1' : '0') . '---' . ($withGraphics ? '1' : '0') . '%%' . $version);
         if ($force || !isset($this->filesdata[$cacheKey]) || !$this->filesdata[$cacheKey]) {
-            $res=$this->_getFile($page, $format, $resolution, $quality, $withText, $withGraphics, $version, $force);
+            $res = $this->_getFile($page, $format, $resolution, $quality, $withText, $withGraphics, $version, $force);
             $this->filesdata[$cacheKey] = $res;
         }
         return $this->filesdata[$cacheKey];
@@ -579,7 +579,7 @@ class wsDocument extends cubeMetier
             $q = ($format === 'jpg' && $quality != 85) ? $quality : '';
             $prefix = $withText ? 't' : 'h';
             if ($resolution === 'thumb') {
-                $file = $dir . 'p' . $page . '.' . $format;
+                $file = $dir . 'p' . $page . $q . '.' . $format;
             } else {
                 $file = $dir . $prefix . $page . '-' . $resolution . $q . '.' . $format;
             }