From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Thu, 26 May 2011 14:41:09 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=c74c321b7b338e3e54a46c4c2753bf23c2b45bbe;p=cubeextranet.git

---

diff --git a/fluidbook/tools/fwstk.jar b/fluidbook/tools/fwstk.jar
index d8d10f35b..52b0113ef 100644
Binary files a/fluidbook/tools/fwstk.jar and b/fluidbook/tools/fwstk.jar differ
diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php
index 083c5e6d2..2293b7f58 100644
--- a/inc/ws/Controlleur/class.ws.url.php
+++ b/inc/ws/Controlleur/class.ws.url.php
@@ -322,8 +322,6 @@ class wsUrl {
 			http::redirect(SITE_PATH . 'editor/' . $book->book_id);
 		}
 
-		cubePage::swfaddress();
-
 		$res = '<html><head><style type="text/css">';
 		$res .= '#composerSwf{width:100%;height:100%;margin:0 auto;}
 body{margin:0;padding:0;height:100%;overflow:hidden;background:#d2d3c7;}
@@ -510,8 +508,7 @@ html{height:100%}' . "\n";
 			'book_id' => $args[0]);
 
 		$mtime = filemtime(ROOT . '/swf/composer.swf');
-		$res = cubeMedia::flash2(WEBROOT . '/swf/composer.swf?junk=' . $mtime, '100%', '100%', $fv, 'composerSwf', 'swfPanel', 10, '#d2d3c7', '', 'false', 'noscale', 'normal', array(), false, true, true);
-		return $res;
+		return cubeMedia::flash2(WEBROOT . '/swf/composer.swf?junk=' . $mtime, '100%', '100%', $fv, 'composerSwf', 'swfPanel', 10, '#d2d3c7', '', 'false', 'noscale', 'normal', array(), false, true, false);
 	}
 
 	public static function stats($args) {
diff --git a/inc/ws/DAO/class.ws.dao.lang.php b/inc/ws/DAO/class.ws.dao.lang.php
index c1406c594..f63ca2302 100644
--- a/inc/ws/DAO/class.ws.dao.lang.php
+++ b/inc/ws/DAO/class.ws.dao.lang.php
@@ -30,7 +30,7 @@ class wsDAOLang extends commonDAO {
 
 	public function selectAll()
 	{
-		$r = $this->con->select('SELECT * FROM langues WHERE CHAR_LENGTH(lang_id)=2');
+		$r = $this->con->select('SELECT * FROM langues');
 		return $this->factory($r);
 	}
 
