[Phpgroupware-cvs] admin/inc class.so_custom.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    admin
Changes by:     Sigurd Nes <sigurdne>   06/10/08 21:42:26

Modified files:
        inc            : class.so_custom.inc.php 

Log message:
        fix

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.so_custom.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4

Patches:
Index: class.so_custom.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.so_custom.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- class.so_custom.inc.php     14 Sep 2006 18:53:32 -0000      1.3
+++ class.so_custom.inc.php     8 Oct 2006 21:42:26 -0000       1.4
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage admin
-       * @version $Id: class.so_custom.inc.php,v 1.3 2006/09/14 18:53:32 
sigurdne Exp $
+       * @version $Id: class.so_custom.inc.php,v 1.4 2006/10/08 21:42:26 
sigurdne Exp $
        */
 
        /**
@@ -113,7 +113,12 @@
                                $querymethod = " AND (phpgw_cust_attribute.name 
$this->like '%$query%' or phpgw_cust_attribute.descr $this->like '%$query%')";
                        }
 
-                       $sql = "SELECT * FROM phpgw_cust_attribute WHERE 
appname='$appname' AND location = '$location' $filtermethod $querymethod";
+       //              $sql = "SELECT * FROM phpgw_cust_attribute WHERE 
appname='$appname' AND location = '$location' $filtermethod $querymethod";
+
+                       $sql = "SELECT * FROM phpgw_cust_attribute $this->join 
phpgw_cust_attribute_table"
+                               . " ON phpgw_cust_attribute.table_id = 
phpgw_cust_attribute_table.table_id"
+                               . " WHERE appname = '$appname' AND location = 
'$location' $filtermethod $querymethod";
+       
 
                        $this->db2->query($sql,__LINE__,__FILE__);
                        $this->total_records = $this->db2->num_rows();