From 8f0baa1790a889b85379faa90729a403425047ed Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 8 Jun 2010 08:55:48 +0000
Subject: [PATCH] Bookmarks are sorted on position

---
 htdocs/bookmarks/bookmarks.lib.php      | 1 +
 htdocs/bookmarks/liste.php              | 4 ++--
 htdocs/includes/boxes/box_bookmarks.php | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index c7b3daa2432..4664a61dd97 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -66,6 +66,7 @@ function printBookmarksList ($aDb, $aLangs)
 	{
 		$sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
 		if (! $user->admin) $sql.= " WHERE (fk_user = ".$user->id." OR fk_user is NULL OR fk_user = 0)";
+		$sql.= " ORDER BY position";
 		if ($resql = $db->query($sql) )
 		{
 			$i=0;
diff --git a/htdocs/bookmarks/liste.php b/htdocs/bookmarks/liste.php
index 3fa64208151..85329c97d95 100644
--- a/htdocs/bookmarks/liste.php
+++ b/htdocs/bookmarks/liste.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2005-2009 Laurent Destailleur       <eldy@users.sourceforge.net>
+/* Copyright (C) 2005-2010 Laurent Destailleur       <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -77,7 +77,7 @@ $sql.= " u.login, u.name, u.firstname";
 $sql.= " FROM ".MAIN_DB_PREFIX."bookmark as b LEFT JOIN ".MAIN_DB_PREFIX."user as u ON b.fk_user=u.rowid";
 $sql.= " WHERE 1=1";
 if (! $user->admin) $sql.= " AND (b.fk_user = ".$user->id." OR b.fk_user is NULL OR b.fk_user = 0)";
-$sql.= $db->order($sortfield,$sortorder);
+$sql.= $db->order($sortfield.", position",$sortorder);
 $sql.= $db->plimit( $limit, $offset);
 
 $resql=$db->query($sql);
diff --git a/htdocs/includes/boxes/box_bookmarks.php b/htdocs/includes/boxes/box_bookmarks.php
index 2cc543bb24f..58623b561b5 100644
--- a/htdocs/includes/boxes/box_bookmarks.php
+++ b/htdocs/includes/boxes/box_bookmarks.php
@@ -78,8 +78,8 @@ class box_bookmarks extends ModeleBoxes {
 			$sql = "SELECT b.title, b.url, b.target, b.favicon";
 			$sql.= " FROM ".MAIN_DB_PREFIX."bookmark as b";
 			$sql.= " WHERE fk_user = ".$user->id;
-			$sql .= " ORDER BY b.dateb DESC ";
-			$sql .= $db->plimit($max, 0);
+			$sql.= $db->order("position","ASC");
+			$sql.= $db->plimit($max, 0);
 
 			$result = $db->query($sql);