[Phpgroupware-cvs] property/class.solocation.php, 1.1.1.7

[nomail]

Update of /property
Modified Files:
        Branch: 
          class.solocation.php

date: 2004/05/18 17:53:21;  author: sigurdne;  state: Exp;  lines: +2 -2

Log Message:
no message
=====================================================================
Index: property/class.solocation.php
diff -u property/class.solocation.php:1.1.1.6 
property/class.solocation.php:1.1.1.7
--- property/class.solocation.php:1.1.1.6       Fri Apr 30 17:35:56 2004
+++ property/class.solocation.php       Tue May 18 17:53:21 2004
@@ -303,7 +303,7 @@
 
                                if($lookup_tenant)
                                {
-                                       $cols.= ',fm_tenant.tenant_id';
+                                       $cols.= ',fm_tenant.id as tenant_id';
                                        $cols_return[]                          
= 'tenant_id';
                                        $uicols['input_type'][]         = 
'hidden';
                                        $uicols['name'][]                       
= 'tenant_id';
@@ -717,7 +717,7 @@
                                        }
                                        
elseif($config[$i]['column_name']=='tenant_id'):
                                        {
-                                               $cols.= ',fm_tenant.tenant_id';
+                                               $cols.= ',fm_tenant.id as 
tenant_id';
                                                $cols_return[]                  
        = 'tenant_id';
                                                $uicols['input_type'][]         
        = 'hidden';
                                                $uicols['name'][]               
        = 'tenant_id';