[Fmsystem-commits] [6609] Property: fix location query

[Sigurd Nes]

Revision: 6609
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6609
Author:   sigurdne
Date:     2010-11-17 12:57:28 +0000 (Wed, 17 Nov 2010)
Log Message:
-----------
Property: fix location query

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

Modified: trunk/property/inc/class.custom_fields.inc.php
===================================================================
--- trunk/property/inc/class.custom_fields.inc.php      2010-11-17 10:35:28 UTC 
(rev 6608)
+++ trunk/property/inc/class.custom_fields.inc.php      2010-11-17 12:57:28 UTC 
(rev 6609)
@@ -407,7 +407,7 @@
                                {
                                        if($field == 'location_code')
                                        {
-                                               $location = 
split('-',$data['value']);
+                                               $location = 
explode('-',$data['value']);
                                        }
 
                                        if(($data['datatype']=='R' || 
$data['datatype']=='LB') && $data['value'])
@@ -479,15 +479,17 @@
 
                                        if($location)
                                        {
-                                               if(!$location_count)
+                                               $_location_count = 
$location_count;
+                                               if(!$_location_count)
                                                {
-                                                       $location_count = 
count($location);
+                                                       $_location_count = 
count($location);
                                                }
-                                               for ($m=0;$m < $location_count 
; $m++)
+                                               for ($m=0;$m < $_location_count 
; $m++)
                                                {
                                                        $ret[$j]['loc' . 
($m+1)] = $location[$m];
                                                        
$ret[$j]['query_location']['loc' . ($m+1)]=implode('-', array_slice($location, 
0, ($m + 1)));
                                                }
+                                               $_location_count = 0;
                                        }
                                }
                                $j++;