(no commit message)

diff --git a/inc/extranet/Controlleur/class.extranet.core.php b/inc/extranet/Controlleur/class.extranet.core.php
index 5117ed40b08a6ba0b63b58edfd7cb6129cc49ab4..b69102b130931799c59da7babd5b7b6422d29eb3 100644 (file)
--- 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 '\r
                         . 'LEFT JOIN books b ON t.theme_id=b.theme '\r
                         . 'GROUP BY t.theme_id');\r
-               // cubeDb::mysqlConvert($this->con);\r
+               //cubeDb::mysqlConvert($this->con);\r
                touch($cache);\r
        }\r
 \r

diff --git a/inc/ws/DAO/class.ws.dao.lang.php b/inc/ws/DAO/class.ws.dao.lang.php
index a3be1ab82cf69394755eb7cd8d4f684acf258599..9ef04b46d6283b4e1ae1afcc640cb03767cd3ef9 100644 (file)
--- 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 {
 \r
        public function selectById($lang_id)\r
        {\r
-               $r = $this->con->select('SELECT * FROM langues WHERE lang_id=\'' . $this->con->escape($lang_id) . '\'');\r
+               $r = $this->con->select('SELECT * FROM langues WHERE lang_id=\'' . $this->con->escape($lang_id).'\'' );\r
                return $this->singleton($r);\r
        }\r
 \r
        public function selectAll()\r
        {\r
-               $r = $this->con->select('SELECT * FROM langues');\r
+               $r = $this->con->select('SELECT * FROM langues ORDER BY public DESC,(CHAR_LENGTH(lang_id)=2) DESC, nom ASC');\r
                return $this->factory($r);\r
        }\r
 }\r