summaryrefslogtreecommitdiffstats
path: root/apps/calendar/lib
diff options
context:
space:
mode:
authorGeorg Ehrke <dev@georgswebsite.de>2012-06-06 10:12:11 +0200
committerGeorg Ehrke <dev@georgswebsite.de>2012-06-06 10:12:11 +0200
commit2fa19ce9a0e26fe9b870b97bf3a2f13290d2231c (patch)
tree3817e11f67addc82f924dfec8b1a39fc86933e21 /apps/calendar/lib
parentbb02330becc659d817a0730c7654dbd873c66332 (diff)
parentfce614b82c61a0d2e45ffe05bbe030d842f3ca16 (diff)
downloadnextcloud-server-2fa19ce9a0e26fe9b870b97bf3a2f13290d2231c.tar.gz
nextcloud-server-2fa19ce9a0e26fe9b870b97bf3a2f13290d2231c.zip
Merge branch 'master' into calendar_repeat
Diffstat (limited to 'apps/calendar/lib')
-rw-r--r--apps/calendar/lib/object.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index f0a9bf050fc..cc80a0bb708 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -600,8 +600,8 @@ class OC_Calendar_Object{
public static function updateVCalendarFromRequest($request, $vcalendar)
{
- $title = $request["title"];
- $location = $request["location"];
+ $title = strip_tags($request["title"]);
+ $location = strip_tags($request["location"]);
$categories = $request["categories"];
$allday = isset($request["allday"]);
$from = $request["from"];
@@ -611,7 +611,7 @@ class OC_Calendar_Object{
$totime = $request['totime'];
}
$vevent = $vcalendar->VEVENT;
- $description = $request["description"];
+ $description = strip_tags($request["description"]);
$repeat = $request["repeat"];
if($repeat != 'doesnotrepeat'){
$rrule = '';