From 57ea4fc23d3ddda712b012d694467aa8def1fa5a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 13 Oct 2015 14:40:02 +0200
Subject: [PATCH] FIX sql syntax error when sort order not defined.

---
 htdocs/core/db/DoliDB.class.php | 4 ++--
 htdocs/projet/index.php         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index fa9db9ea4b4..f1909a91ea0 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -226,7 +226,7 @@ abstract class DoliDB implements Database
 	 */
 	function order($sortfield=null,$sortorder=null)
 	{
-		if (isset($sortfield))
+		if (! empty($sortfield))
 		{
 			$return='';
 			$fields=explode(',',$sortfield);
@@ -236,7 +236,7 @@ abstract class DoliDB implements Database
 				else $return.=',';
 
 				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
-				if (isset($sortorder))
+				if (! empty($sortorder))
 				{
 					$return.=' '.preg_replace('/[^0-9a-z]/i','',$sortorder);
 				}
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 95e4ce98a5e..e316603c2b7 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -229,6 +229,7 @@ $sql.= " AND p.fk_statut = 1";
 if ($mine || empty($user->rights->projet->all->lire)) $sql.= " AND p.rowid IN (".$projectsListId.")";
 if ($socid)	$sql.= "  AND (p.fk_soc IS NULL OR p.fk_soc = 0 OR p.fk_soc = ".$socid.")";
 $sql.= " GROUP BY s.nom, s.rowid";
+$sql.= $db->order($sortfield, $sortorder);
 
 $var=true;
 $resql = $db->query($sql);