[Fmsystem-commits] [11177] fix bug in short descr

[Sigurd Nes]

Revision: 11177
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11177
Author:   sigurdne
Date:     2013-06-16 17:01:33 +0000 (Sun, 16 Jun 2013)
Log Message:
-----------
fix bug in short descr

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

Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php   2013-06-14 12:14:37 UTC (rev 
11176)
+++ trunk/property/inc/class.soentity.inc.php   2013-06-16 17:01:33 UTC (rev 
11177)
@@ -1703,13 +1703,14 @@
                        $prop_array = $this->read_single($params, 
$cache_attributes[$location_id]);
 
                        $_short_description = array();
-                       foreach ($prop_array['attributes'] as $attribute)
+
+                       foreach ($prop_array['attributes'] as $key => 
$attribute)
                        {
                                $description_value = $attribute['value'];
 
-                               
if(isset($cache_attributes[$location_id]['attributes'][$attribute['value']]['choice'])
 && 
$cache_attributes[$location_id]['attributes'][$attribute['value']]['choice'])
+                               
if(isset($cache_attributes[$location_id]['attributes'][$key]['choice']) && 
$cache_attributes[$location_id]['attributes'][$key]['choice'])
                                {
-                                       $choice = 
$cache_attributes[$location_id]['attributes'][$attribute['value']]['choice'];
+                                       $choice = 
$cache_attributes[$location_id]['attributes'][$key]['choice'];
                                        foreach($choice as $choice_value)
                                        {
                                                if ($choice_value['id'] == 
$attribute['value'])
@@ -1720,7 +1721,10 @@
                                        }
                                }
 
-                               $short_description[] = 
"{$attribute['input_text']}: {$description_value}";
+                               if($description_value)
+                               {
+                                       $short_description[] = 
"{$attribute['input_text']}: {$description_value}";
+                               }
                        }
 
                        $short_description = implode(', ', $short_description);