(no commit message)

diff --git a/inc/ws/DAO/class.ws.dao.book.php b/inc/ws/DAO/class.ws.dao.book.php
index a69cfca9479ae7de4fdb20585cf9c7f38d42795c..3dbd89d259abd72ba8166d0a6bb44aa13969622e 100644 (file)
--- a/inc/ws/DAO/class.ws.dao.book.php
+++ b/inc/ws/DAO/class.ws.dao.book.php
@@ -61,7 +61,7 @@ class wsDAOBook extends commonDAO {
        protected function getNextId()\r
        {\r
                $r = $this->con->select('SELECT MAX(book_id) AS book_id FROM books');\r
-               if($r<10000){\r
+               if ($r < 10000) {\r
                        return 10000;\r
                }\r
                return $r->book_id + 1;\r
@@ -667,16 +667,18 @@ class wsDAOBook extends commonDAO {
                }\r
                // Theme assets\r
                $themeRoot = WS_THEMES . '/' . $theme->theme_id . '/';\r
-               if ($theme->parametres->useBackgroundImage) {\r
+               if ($theme->parametres->backgroundImage != '') {\r
                        $flexLight->addBitmap($themeRoot . $theme->parametres->backgroundImage, 'background');\r
                }\r
-               if ($theme->parametres->useMenuImage) {\r
+               if ($theme->parametres->menuImage != '') {\r
                        $flex->addBitmap($themeRoot . $theme->parametres->menuImage, 'menu');\r
                }\r
                if ($theme->parametres->logoLoader != '') {\r
                        $flexLight->addBitmap($themeRoot . $theme->parametres->logoLoader, 'logoLoader');\r
                }\r
-               $flex->addBitmap($themeRoot . $theme->parametres->logo, 'logo');\r
+               if ($theme->parametres->logo != '') {\r
+                       $flex->addBitmap($themeRoot . $theme->parametres->logo, 'logo');\r
+               }\r
                // Icons assets\r
                $iconsRoot = WS_ICONS . '/' . $theme->parametres->iconSet . '/';\r
                foreach(wsIcone::$files as $file) {\r