wait #5717 @0.75

diff --git a/inc/postconfig.inc.php b/inc/postconfig.inc.php
index 7bab2217c50636ae1a691b86665a471d499ba358..13fe8fd607adb5e226678d31901744b14d6c79f1 100644 (file)
--- a/inc/postconfig.inc.php
+++ b/inc/postconfig.inc.php
@@ -42,8 +42,10 @@ define('WS_URL', SCHEME . '://workshop.fluidbook.com');
 \r
 if ($ws) {\r
     define('MODE', 'ws');\r
+    define('SITE_URL',WS_URL);\r
 } elseif ($extranet) {\r
     define('MODE', 'extranet');\r
+    define('SITE_URL',EXTRANET_URL);\r
 }\r
 \r
 define('STATIC_SERVER', SCHEME . '://' . $_SERVER['HTTP_HOST'] . WEBROOT);\r

diff --git a/inc/ws/Controlleur/class.ws.droits.php b/inc/ws/Controlleur/class.ws.droits.php
index f4efed9128dce45a7221e31d8c367b0c9997890b..714816e6d7302470f266e949841eca7a3b64e63a 100644 (file)
--- a/inc/ws/Controlleur/class.ws.droits.php
+++ b/inc/ws/Controlleur/class.ws.droits.php
@@ -141,7 +141,7 @@ class wsDroits
             return true;\r
         }\r
         $daoBook = new wsDAOBook($core->con);\r
-        $books = $daoBook->getListe(null, null, null, true);\r
+        $books = $daoBook->getListe(null, null, null, $core->user);\r
         foreach ($books as $book) {\r
             if ($book->book_id == $book_id) {\r
                 return true;\r