[Fmsystem-commits] [9671] property : cache cols for filter_role_on_contact

[Sigurd Nes]

Revision: 9671
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9671
Author:   sigurdne
Date:     2012-06-26 13:52:47 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
property :  cache cols for filter_role_on_contact

Modified Paths:
--------------
    trunk/property/inc/class.solocation.inc.php

Modified: trunk/property/inc/class.solocation.inc.php
===================================================================
--- trunk/property/inc/class.solocation.inc.php 2012-06-26 12:46:17 UTC (rev 
9670)
+++ trunk/property/inc/class.solocation.inc.php 2012-06-26 13:52:47 UTC (rev 
9671)
@@ -570,14 +570,14 @@
                                $sql = "SELECT $cols $from $joinmethod";
 
                                $this->socommon->fm_cache('sql_'. $type_id . 
'_lt' . $lookup_tenant . '_l' . $lookup . '_f' . !!$filter_role_on_contact 
,$sql);
-                               $this->socommon->fm_cache('uicols_'. $type_id  
. '_' . $lookup_tenant . '_' . $lookup,$uicols);
-                               $this->socommon->fm_cache('cols_return_'. 
$type_id  . '_' . $lookup_tenant . '_' . $lookup,$cols_return);
+                               $this->socommon->fm_cache('uicols_'. $type_id  
. '_' . $lookup_tenant . '_' . $lookup . '_f' . 
!!$filter_role_on_contact,$uicols);
+                               $this->socommon->fm_cache('cols_return_'. 
$type_id  . '_' . $lookup_tenant . '_' . $lookup . '_f' . 
!!$filter_role_on_contact,$cols_return);
 
                        }
                        else
                        {
-                               $uicols = $this->socommon->fm_cache('uicols_'. 
$type_id  . '_' . $lookup_tenant . '_' . $lookup);
-                               $cols_return = 
$this->socommon->fm_cache('cols_return_'. $type_id  . '_' . $lookup_tenant . 
'_' . $lookup);
+                               $uicols = $this->socommon->fm_cache('uicols_'. 
$type_id  . '_' . $lookup_tenant . '_' . $lookup . '_f' . 
!!$filter_role_on_contact);
+                               $cols_return = 
$this->socommon->fm_cache('cols_return_'. $type_id  . '_' . $lookup_tenant . 
'_' . $lookup . '_f' . !!$filter_role_on_contact);
 
                                $sub_query_tenant       = 
$this->socommon->fm_cache('sub_query_tenant_'. $type_id  . '_' . $lookup_tenant 
. '_' . $lookup);
                                $sub_query_street       = 
$this->socommon->fm_cache('sub_query_street_'. $type_id  . '_' . $lookup_tenant 
. '_' . $lookup);