[Noalyss-commit] [noalyss] 01/03: Task #1144 - Favori : nombre max #1144: Favoris, amélioration apparence, tri et permet ajouter reference directe

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit ccd6d3023d8c744de729c20aa98d4344f254f9d1
Author: Dany De Bontridder <address@hidden>
Date:   Thu Jul 9 14:21:14 2015 +0200

    Task #1144 - Favori : nombre max
    #1144: Favoris, amélioration apparence, tri et permet ajouter reference 
directe
---
 include/ajax_bookmark.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/ajax_bookmark.php b/include/ajax_bookmark.php
index c67d7eb..854e42c 100644
--- a/include/ajax_bookmark.php
+++ b/include/ajax_bookmark.php
@@ -57,11 +57,11 @@ if (isset($_GET['bookmark_delete']) && isset 
($_GET['book'])){
     }
 }
 
-$bookmark_sql="select distinct b_id,b_action,b_order,me_description, 
javascript"
+$bookmark_sql="select distinct b_id,b_action,b_order,me_code,me_description, 
javascript"
         . " from bookmark "
-        . "join v_menu_description_favori on (code=b_action)"
+        . "join v_menu_description_favori on (code=b_action or 
b_action=me_code)"
         . "where "
-        . "login=$1 order by b_order,b_action";
+        . "login=$1 order by me_code";
 $a_bookmark=$cn->get_array($bookmark_sql,array($g_user->login));
 $url="do.php?gDossier=".Dossier::id()."&ac=";
 ?>