(no commit message)

diff --git a/.htaccess b/.htaccess
index cdd2680f360ae93713de39efb12f63d77db3fe21..8e945aca9695661301f05f6d362a749d25646e7d 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -18,10 +18,6 @@ AddCharset UTF-8 log
        RewriteEngine on\r
        RewriteBase /\r
 \r
-       # Dev\r
-       RewriteCond %{HTTP_HOST} dev.ws.fluidbook.com\r
-       RewriteRule ^(.*)$ http://workshop.fluidbook.com/$1 [R=301]\r
-\r
        # Favicon\r
        RewriteCond %{HTTP_HOST} cubedesigners\r
        RewriteRule ^favicon.ico$ images/extranet/favicon.ico [L]\r
@@ -29,11 +25,6 @@ AddCharset UTF-8 log
        RewriteCond %{HTTP_HOST} fluidbook\r
        RewriteRule ^favicon.ico$ images/ws/favicon.ico [L]\r
 \r
-       # Skip\r
-       RewriteRule ^phpMyAdmin - [L]\r
-       #RewriteRule ^books - [L]\r
-       #RewriteRule ^docs - [L]\r
-\r
        RewriteRule ^ajax/supprimeFichier/([0-9]+)/(.*)$ index.php/ajax/supprimeFichier/$1/$2 [L]\r
        RewriteRule ^telecharger/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telecharger/$1/$2/$3 [L]\r
        RewriteRule ^telechargerr/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telechargerr/$1/$2/$3 [L]\r

diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 71045dd4d04aec6dd45a4d872f6559697ecef51d..26792cefd48f87538db2307607ea10d1b6859d29 100644 (file)
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -610,7 +610,8 @@ html{height:100%}' . "\n";
 \r
                $fv = array(session_name() => session_id(),\r
                        'book_id' => $book_id,\r
-                       'hash' => $hash);\r
+                       'hash' => $hash,\r
+                       'url' => '/');\r
 \r
                $mtime = filemtime(ROOT . '/swf/composer.swf');\r
                return cubeMedia::flash2(WEBROOT . '/swf/composer.swf?junk=' . $mtime, '100%', '100%', $fv, 'composerSwf', 'swfPanel', 10, '#d2d3c7', '', 'false', 'noscale', 'normal', array(), false, true, false);\r