[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15323] booking: fixes
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15323] booking: fixes |
Date: |
Thu, 23 Jun 2016 11:44:25 +0000 (UTC) |
Revision: 15323
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15323
Author: sigurdne
Date: 2016-06-23 11:44:25 +0000 (Thu, 23 Jun 2016)
Log Message:
-----------
booking: fixes
Modified Paths:
--------------
trunk/activitycalendar/inc/class.soactivity.inc.php
trunk/booking/inc/class.uiapplication.inc.php
trunk/booking/inc/class.uievent.inc.php
Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2016-06-23 09:43:09 UTC
(rev 15322)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2016-06-23 11:44:25 UTC
(rev 15323)
@@ -1046,7 +1046,7 @@
function get_targetgroups()
{
- $sql = "SELECT * FROM bb_agegroup where active=1 AND
NOT name like 'Tilskuer%' ORDER BY sort";
+ $sql = "SELECT * FROM bb_agegroup where active=1 AND
activity_id = 1 AND NOT name like 'Tilskuer%' ORDER BY sort";
$this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
{
Modified: trunk/booking/inc/class.uiapplication.inc.php
===================================================================
--- trunk/booking/inc/class.uiapplication.inc.php 2016-06-23 09:43:09 UTC
(rev 15322)
+++ trunk/booking/inc/class.uiapplication.inc.php 2016-06-23 11:44:25 UTC
(rev 15323)
@@ -955,7 +955,7 @@
);
foreach ($copy as $f)
{
- $event[] = array($f,
htmlentities($application[$f]));
+ $event[] = array($f,
htmlentities(html_entity_decode($application[$f])), ENT_QUOTES |
ENT_SUBSTITUTE);
}
foreach ($application['agegroups'] as $ag)
{
Modified: trunk/booking/inc/class.uievent.inc.php
===================================================================
--- trunk/booking/inc/class.uievent.inc.php 2016-06-23 09:43:09 UTC (rev
15322)
+++ trunk/booking/inc/class.uievent.inc.php 2016-06-23 11:44:25 UTC (rev
15323)
@@ -676,6 +676,10 @@
list($event, $errors) =
$this->extract_and_validate($event);
+ if ($event['description'])
+ {
+ $event['description'] =
html_entity_decode($event['description']);
+ }
if ($event['customer_organization_number'])
{
$orginfo =
$this->bo->so->get_org($event['customer_organization_number']);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15323] booking: fixes,
sigurdne <=