(no commit message)

diff --git a/inc/config.inc.php b/inc/config.inc.php
index 8fb7e5fb8e2deb551d8def8d4e0a3fbb3a1ea3c2..11f8c09396d5a5037ba4da9a208906a25263badf 100644 (file)
--- a/inc/config.inc.php
+++ b/inc/config.inc.php
@@ -61,7 +61,7 @@ define('WS_THEMES', WS_FILES . '/themes');
 define('WS_CACHE', WS_FILES . '/cache');\r
 define('WS_COMPILE_ASSETS', WS_FILES . '/compile');\r
 define('WS_SOUNDS', WS_FILES . '/sounds');\r
-// define('MINIMIZE_JS', false);\r
+\r
 define('WORKER_PREFIX', 'worker.');\r
 \r
 define('CACHE', ROOT . '/cache');\r
@@ -81,8 +81,6 @@ define('IMG', WEBROOT . '/images/' . MODE);
 define('TYPOGRAPHP_PATH', ROOT . '/typo/' . MODE);\r
 define('TYPOGRAPHP_WEBROOT', IMG . '/typographp');\r
 \r
-//define('MINIMIZE_JS', false);\r
-\r
 define('JOURNEE', 8);\r
 define('TAUX_JOURNALIER', 500);\r
 define('AVAILABLE_LANGS', 'fr,en');\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index ebb49e0170948e24d210e26aa78aae165be42b3f..114f3351b3de5c7b767cc47b8f41265565da9a36 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -51,8 +51,10 @@ class wsUrl {
                $dao->setFiltres($settings['filtres']);\r
                $liste = $dao->getListe($settings['orderby'], $settings['sens'], $settings['limit'], $core->user);\r
 \r
-               $res = self::contextBookDownload($context_download_id);\r
-               $res = self::contextBookStatus($context_status_id);\r
+               $res = '';\r
+\r
+               $res .= self::contextBookDownload($context_download_id);\r
+               $res .= self::contextBookStatus($context_status_id);\r
 \r
                $res .= '<table class="liste">';\r
                $res .= '<tr><th>' . commonUrl::orderby('#', 'book_id', $settings, 'sort' . $change) . '</th>';\r