From 6af4d248b76acbf8e591b3f74a290f4d06bf5b82 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Thu, 24 Jun 2010 13:06:45 +0000 Subject: [PATCH] --- inc/extranet/Controlleur/class.extranet.core.php | 2 +- inc/ws/DAO/class.ws.dao.lang.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php index 5117ed40b..b69102b13 100644 --- a/inc/extranet/Controlleur/class.extranet.core.php +++ b/inc/extranet/Controlleur/class.extranet.core.php @@ -460,7 +460,7 @@ class extranetCore extends cubeCore { . 'FROM themes t ' . 'LEFT JOIN books b ON t.theme_id=b.theme ' . 'GROUP BY t.theme_id'); - // cubeDb::mysqlConvert($this->con); + //cubeDb::mysqlConvert($this->con); touch($cache); } diff --git a/inc/ws/DAO/class.ws.dao.lang.php b/inc/ws/DAO/class.ws.dao.lang.php index a3be1ab82..9ef04b46d 100644 --- a/inc/ws/DAO/class.ws.dao.lang.php +++ b/inc/ws/DAO/class.ws.dao.lang.php @@ -19,13 +19,13 @@ class wsDAOLang extends extranetDAO { public function selectById($lang_id) { - $r = $this->con->select('SELECT * FROM langues WHERE lang_id=\'' . $this->con->escape($lang_id) . '\''); + $r = $this->con->select('SELECT * FROM langues WHERE lang_id=\'' . $this->con->escape($lang_id).'\'' ); return $this->singleton($r); } public function selectAll() { - $r = $this->con->select('SELECT * FROM langues'); + $r = $this->con->select('SELECT * FROM langues ORDER BY public DESC,(CHAR_LENGTH(lang_id)=2) DESC, nom ASC'); return $this->factory($r); } } -- 2.39.5