wait #3895 @0.5

diff --git a/inc/commons/DAO/class.common.dao.entreprise.php b/inc/commons/DAO/class.common.dao.entreprise.php
index 44d8a4dc19933efa55d26dbd3df10fc98bd6aa4a..cac60307898fb3c65c26676ce883b84b5160a45a 100644 (file)
--- a/inc/commons/DAO/class.common.dao.entreprise.php
+++ b/inc/commons/DAO/class.common.dao.entreprise.php
@@ -196,7 +196,7 @@ class commonDAOEntreprise extends commonDAO
 
     public function supprime($entreprise_id)
     {
-        global $core;:
+        global $core;
         $this->con->execute('DELETE FROM e2_u WHERE entreprise=\'' . $this->con->escape($entreprise_id) . '\'');
         $this->con->execute('DELETE FROM e2_c WHERE entreprise_id=\'' . $this->con->escape($entreprise_id) . '\'');
         $core->refreshWSUsersTree();

diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index 7c38cf50669e7a944d53d0d0e73326f07109b1f9..35231b8d63e3e158a85385f3dca7d504d1e93392 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -2085,7 +2085,7 @@ class zoomLink extends normalLink
         $y = $attributes['y'];
         $w = $attributes['width'];
         $h = $attributes['height'];
-        $bookwidth = round($compiler->book->parametres->width);
+        $bookwidth = round($compiler->width);
 
         //error_log("--- Book Width: $bookwidth ---");