[Fmsystem-commits] [14872] Merge 14870:14871 from trunk

[Sigurd Nes]

Revision: 14872
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14872
Author:   sigurdne
Date:     2016-03-29 11:34:03 +0000 (Tue, 29 Mar 2016)
Log Message:
-----------
Merge 14870:14871 from trunk

Modified Paths:
--------------
    
branches/Version-2_0-branch/booking/inc/class.socompleted_reservation.inc.php

Property Changed:
----------------
    branches/Version-2_0-branch/
    branches/Version-2_0-branch/booking/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869
   + /branches/dev-syncromind:13653
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871


Property changes on: branches/Version-2_0-branch/booking
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845
   + /branches/stavangerkommune/booking:9468-12740,12743-12875,12986
/trunk/booking:14721-14732,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14871

Modified: 
branches/Version-2_0-branch/booking/inc/class.socompleted_reservation.inc.php
===================================================================
--- 
branches/Version-2_0-branch/booking/inc/class.socompleted_reservation.inc.php   
    2016-03-29 11:32:26 UTC (rev 14871)
+++ 
branches/Version-2_0-branch/booking/inc/class.socompleted_reservation.inc.php   
    2016-03-29 11:34:03 UTC (rev 14872)
@@ -190,7 +190,7 @@
                                case 'allocation':
                                        return 
$this->get_building_for_season($reservation['season_id']);
                                case 'event':
-                                       return count($reservation['resources']) 
> 0 ? $this->get_building_for_resource($reservation['resources'][0]) : '';
+                                       return array('id' => 
$reservation['building_id'], 'name' => $reservation['building_name'] );
                        }
 
                        return '';