[Phpgroupware-cvs] property/inc class.solocation.inc.php

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    property
Changes by:     Sigurd Nes <sigurdne>   06/09/14 06:21:40

Modified files:
        inc            : class.solocation.inc.php 

Log message:
        

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.solocation.inc.php?cvsroot=phpgroupware&r1=1.32&r2=1.33

Patches:
Index: class.solocation.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- class.solocation.inc.php    6 Sep 2006 07:18:36 -0000       1.32
+++ class.solocation.inc.php    14 Sep 2006 06:21:40 -0000      1.33
@@ -8,7 +8,7 @@
        * @internal Development of this application was funded by 
http://www.bergen.kommune.no/bbb_/ekstern/
        * @package property
        * @subpackage location
-       * @version $Id: class.solocation.inc.php,v 1.32 2006/09/06 07:18:36 
sigurdne Exp $
+       * @version $Id: class.solocation.inc.php,v 1.33 2006/09/14 06:21:40 
sigurdne Exp $
        */
 
        /**
@@ -1109,10 +1109,16 @@
 
                        if($filter>0)
                        {
-                               $filtermethod .= " $where fm_owner.id=$filter";
-                               $where = 'AND';
+                               
if($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['property_filter']
 == 'owner')
+                               {
+                                       $filtermethod .= " $where 
fm_owner.id='$filter' ";
+                               }
+                               else
+                               {
+                                       $filtermethod .= " $where 
fm_owner.category='$filter' ";
+                               }
+                               $where= 'AND';
                        }
-
 
                        $uicols['name'][]       = 'number';
                        $uicols['descr'][]      = lang('number');