[Phpgroupware-cvs] hrm/inc class.socommon.inc.php class.soplace.in...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    hrm
Branch:         
Changes by:     Sigurd Nes <address@hidden>     06/05/23 13:02:42

Modified files:
        inc            : class.socommon.inc.php class.soplace.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.socommon.inc.php.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/hrm/inc/class.soplace.inc.php.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: hrm/inc/class.socommon.inc.php
diff -u hrm/inc/class.socommon.inc.php:1.5 hrm/inc/class.socommon.inc.php:1.6
--- hrm/inc/class.socommon.inc.php:1.5  Fri Jan 27 17:02:29 2006
+++ hrm/inc/class.socommon.inc.php      Tue May 23 13:02:42 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage core
-       * @version $Id: class.socommon.inc.php,v 1.5 2006/01/27 17:02:29 
sigurdne Exp $
+       * @version $Id: class.socommon.inc.php,v 1.6 2006/05/23 13:02:42 
sigurdne Exp $
        */
 
        /**
@@ -32,7 +32,7 @@
 
                        $this->account  = 
$GLOBALS['phpgw_info']['user']['account_id'];
 
-                       if 
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql')
+                       if 
($GLOBALS['phpgw_info']['server']['db_type']=='pgsql' || 
$GLOBALS['phpgw_info']['server']['db_type']=='postgres')
                        {
                                $this->join = " JOIN ";
                                $this->like = "ILIKE";
Index: hrm/inc/class.soplace.inc.php
diff -u hrm/inc/class.soplace.inc.php:1.5 hrm/inc/class.soplace.inc.php:1.6
--- hrm/inc/class.soplace.inc.php:1.5   Sat Apr 15 19:04:13 2006
+++ hrm/inc/class.soplace.inc.php       Tue May 23 13:02:42 2006
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package hrm
        * @subpackage place
-       * @version $Id: class.soplace.inc.php,v 1.5 2006/04/15 19:04:13 
sigurdne Exp $
+       * @version $Id: class.soplace.inc.php,v 1.6 2006/05/23 13:02:42 
sigurdne Exp $
        */
 
        /**
@@ -151,7 +151,7 @@
                        $values['name'] = 
$this->db->db_addslashes($values['name']);
                        $values['address'] = 
$this->db->db_addslashes($values['address']);
                        $values['town'] = 
$this->db->db_addslashes($values['town']);
-                       $values['descr'] = 
$this->db->db_addslashes($values['descr']);
+                       $values['remark'] = 
$this->db->db_addslashes($values['remark']);
                        $values['place_id'] = 
$this->bocommon->next_id('phpgw_hrm_training_place');
 
                        $insert_values=array(