[Fmsystem-commits] [6628] merge 6626:6627 from trunk

[Sigurd Nes]

Revision: 6628
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6628
Author:   sigurdne
Date:     2010-11-23 12:32:05 +0000 (Tue, 23 Nov 2010)
Log Message:
-----------
merge 6626:6627 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.solocation.inc.php

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6627

Modified: branches/Version-1_0-branch/property/inc/class.solocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.solocation.inc.php   
2010-11-23 12:27:22 UTC (rev 6627)
+++ branches/Version-1_0-branch/property/inc/class.solocation.inc.php   
2010-11-23 12:32:05 UTC (rev 6628)
@@ -1134,7 +1134,8 @@
                                $this->cols_return      =       
$this->socommon->fm_cache('cols_return_single_'. $type_id);
                        }
 
-                       $sql .= " {$this->join} fm_location{$type_id}_category 
ON (fm_location{$type_id}.category = fm_location{$type_id}_category.id)";
+                       //FIXME: Make sure all locations are linked to a valid 
category
+                       $sql .= " {$this->left_join} 
fm_location{$type_id}_category ON (fm_location{$type_id}.category = 
fm_location{$type_id}_category.id)";
 
                        $sql .= " WHERE 
fm_location$type_id.location_code='$location_code' ";