From cb84f31032f729590d5f718250422ebcde0f6de9 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Wed, 9 Jan 2013 10:29:25 +0000 Subject: [PATCH] --- .htaccess | 9 --------- inc/ws/Controlleur/class.ws.url.php | 3 ++- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.htaccess b/.htaccess index cdd2680f3..8e945aca9 100644 --- a/.htaccess +++ b/.htaccess @@ -18,10 +18,6 @@ AddCharset UTF-8 log RewriteEngine on RewriteBase / - # Dev - RewriteCond %{HTTP_HOST} dev.ws.fluidbook.com - RewriteRule ^(.*)$ http://workshop.fluidbook.com/$1 [R=301] - # Favicon RewriteCond %{HTTP_HOST} cubedesigners RewriteRule ^favicon.ico$ images/extranet/favicon.ico [L] @@ -29,11 +25,6 @@ AddCharset UTF-8 log RewriteCond %{HTTP_HOST} fluidbook RewriteRule ^favicon.ico$ images/ws/favicon.ico [L] - # Skip - RewriteRule ^phpMyAdmin - [L] - #RewriteRule ^books - [L] - #RewriteRule ^docs - [L] - RewriteRule ^ajax/supprimeFichier/([0-9]+)/(.*)$ index.php/ajax/supprimeFichier/$1/$2 [L] RewriteRule ^telecharger/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telecharger/$1/$2/$3 [L] RewriteRule ^telechargerr/([0-9a-fA-F]+)/([0-9]+)/(.*)$ index.php/telechargerr/$1/$2/$3 [L] diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index 71045dd4d..26792cefd 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -610,7 +610,8 @@ html{height:100%}' . "\n"; $fv = array(session_name() => session_id(), 'book_id' => $book_id, - 'hash' => $hash); + 'hash' => $hash, + 'url' => '/'); $mtime = filemtime(ROOT . '/swf/composer.swf'); return cubeMedia::flash2(WEBROOT . '/swf/composer.swf?junk=' . $mtime, '100%', '100%', $fv, 'composerSwf', 'swfPanel', 10, '#d2d3c7', '', 'false', 'noscale', 'normal', array(), false, true, false); -- 2.39.5