[Fmsystem-commits] [15355] Stable: Merge 15353:15354 from trunk

[sigurdne]

Revision: 15355
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15355
Author:   sigurdne
Date:     2016-07-01 08:51:45 +0000 (Fri, 01 Jul 2016)
Log Message:
-----------
Stable: Merge 15353:15354 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/booking/inc/class.soevent.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/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/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,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/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,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354


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,14871,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352
   + /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,14886-14896,14900-14902,14917-14919,14924-14978,14980-15258,15266-15285,15287-15288,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354

Modified: branches/Version-2_0-branch/booking/inc/class.soevent.inc.php
===================================================================
--- branches/Version-2_0-branch/booking/inc/class.soevent.inc.php       
2016-07-01 08:49:54 UTC (rev 15354)
+++ branches/Version-2_0-branch/booking/inc/class.soevent.inc.php       
2016-07-01 08:51:45 UTC (rev 15355)
@@ -116,6 +116,7 @@
 
                function get_ordered_comments( $id )
                {
+                       $id = (int) $id;
                        $results = array();
                        $this->db->query("select time,author,comment,type from 
bb_event_comment where event_id=($id) order by time desc", __LINE__, __FILE__);
                        while ($this->db->next_record())
@@ -130,6 +131,7 @@
 
                function get_ordered_costs( $id )
                {
+                       $id = (int) $id;
                        $results = array();
                        $this->db->query("SELECT * FROM bb_event_cost WHERE 
event_id=($id) ORDER BY time DESC", __LINE__, __FILE__);
                        while ($this->db->next_record())
@@ -177,6 +179,7 @@
 
                function get_contact_mail( $id, $type )
                {
+                       $id = (int) $id;
                        $mail = array();
                        if ($type == 'allocation')
                        {