[Fmsystem-commits] [13792] Syncromind: Merge 13777:13791 from trunk

[Sigurd Nes]

Revision: 13792
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13792
Author:   sigurdne
Date:     2015-08-27 12:32:12 +0000 (Thu, 27 Aug 2015)
Log Message:
-----------
Syncromind: Merge 13777:13791 from trunk

Modified Paths:
--------------
    branches/dev-syncromind/booking/inc/class.socommon.inc.php
    branches/dev-syncromind/property/inc/class.soentity.inc.php

Property Changed:
----------------
    branches/dev-syncromind/
    branches/dev-syncromind/booking/


Property changes on: branches/dev-syncromind
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune:12743-12875,12986
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344,13346-13399,13401-13432,13434-13481,13483-13506,13542-13602,13604-13653,13656-13668,13670-13689,13691-13726,13731-13773,13775
   + /branches/stavangerkommune:12743-12875,12986
/trunk:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,12989-13177,13179-13344,13346-13399,13401-13432,13434-13481,13483-13506,13542-13602,13604-13653,13656-13668,13670-13689,13691-13726,13731-13773,13775,13778-13791


Property changes on: branches/dev-syncromind/booking
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,13179-13344,13434-13481
   + /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:12111-12211,12213-12246,12250-12363,12366-12405,12407-12435,12437-12462,12464-12527,12530-12602,12604-12670,12672-12683,12686-12750,12753-12785,12787-12974,12987,13179-13344,13434-13481,13778-13791

Modified: branches/dev-syncromind/booking/inc/class.socommon.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.socommon.inc.php  2015-08-27 
12:27:29 UTC (rev 13791)
+++ branches/dev-syncromind/booking/inc/class.socommon.inc.php  2015-08-27 
12:32:12 UTC (rev 13792)
@@ -708,7 +708,10 @@
                                        }
                                }
                        }
-                       $this->db->query(join($update_queries, ";\n"), 
__LINE__, __FILE__);
+                       foreach($update_queries as $update_query)
+                       {
+                               $this->db->query($update_query, __LINE__, 
__FILE__);
+                       }
                        $receipt['id'] = $id;
                        $receipt['message'][] = array('msg'=>lang('Entity %1 
has been updated', $entry['id']));
                        return $receipt;

Modified: branches/dev-syncromind/property/inc/class.soentity.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.soentity.inc.php 2015-08-27 
12:27:29 UTC (rev 13791)
+++ branches/dev-syncromind/property/inc/class.soentity.inc.php 2015-08-27 
12:32:12 UTC (rev 13792)
@@ -903,7 +903,7 @@
                        if($sql_custom_field)
                        {
                                $sql = str_replace("SELECT fm_bim_item.*", 
"SELECT fm_bim_item.* {$sql_custom_field}", $sql);
-                               $sql .= "GROUP BY 
fm_bim_item.location_id,fm_bim_item.id,fm_bim_item.type{$sql_custom_group}";
+                               $sql .= " GROUP BY 
fm_bim_item.location_id,fm_bim_item.id,fm_bim_item.type{$sql_custom_group}";
                        }
 //_debug_array($sql);
                        static $cache_attributes = array();