[Phpgroupware-cvs] hrm/inc class.souser.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    hrm
Changes by:     Sigurd Nes <sigurdne>   07/01/02 09:35:14

Modified files:
        inc            : class.souser.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/hrm/inc/class.souser.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18

Patches:
Index: class.souser.inc.php
===================================================================
RCS file: /sources/phpgroupware/hrm/inc/class.souser.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.souser.inc.php        27 Dec 2006 10:38:35 -0000      1.17
+++ class.souser.inc.php        2 Jan 2007 09:35:14 -0000       1.18
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage user
-       * @version $Id: class.souser.inc.php,v 1.17 2006/12/27 10:38:35 
sigurdne Exp $
+       * @version $Id: class.souser.inc.php,v 1.18 2007/01/02 09:35:14 
sigurdne Exp $
        */
 
        /**
@@ -168,20 +168,20 @@
 
                        if ($order)
                        {
-                               $ordermethod = " , $order $sort";
+                               $ordermethod = " ORDER BY $order $sort";
 
                        }
                        else
                        {
-                               $ordermethod = ', start_date asc';
+                               $ordermethod = 'ORDER BY start_date asc';
                        }
 
                        $sql = "SELECT phpgw_hrm_training.id as 
training_id,phpgw_hrm_training.title as title, phpgw_hrm_training.start_date,"
                                . " 
phpgw_hrm_training.end_date,phpgw_hrm_training_place.name as place, 
phpgw_hrm_training_category.descr as category"
                                . " FROM phpgw_hrm_training $this->left_join 
phpgw_hrm_training_place on 
phpgw_hrm_training.place_id=phpgw_hrm_training_place.id"
                                . " $this->join phpgw_hrm_training_category ON 
phpgw_hrm_training.category = phpgw_hrm_training_category.id"
-                               . " WHERE phpgw_hrm_training.user_id=" . 
intval($user_id)
-                               . " order BY category";
+                               . " WHERE phpgw_hrm_training.user_id=" . 
intval($user_id);
+               //              . " order BY category";
 
                        $this->db->query($sql . $ordermethod 
,__LINE__,__FILE__);