Merge branch 'MDL-65262-36' of git://github.com/lameze/moodle into MO…

…ODLE_36_STABLE
moodle · May 3, 2019 · f3b6dde · f3b6dde
2 parents d941f7a + 091cad4
commit f3b6dde
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/calendar/classes/external/event_exporter_base.php b/calendar/classes/external/event_exporter_base.php
@@ -125,7 +125,7 @@ protected static function define_properties() {
                 'null' => NULL_ALLOWED
             ],
             'location' => [
-                'type' => PARAM_RAW_TRIMMED,
+                'type' => PARAM_RAW,
                 'optional' => true,
                 'default' => null,
                 'null' => NULL_ALLOWED

diff --git a/calendar/lib.php b/calendar/lib.php
@@ -2846,7 +2846,7 @@ function calendar_add_icalendar_event($event, $unused = null, $subscriptionid, $
     }
 
     $eventrecord->location = empty($event->properties['LOCATION'][0]->value) ? '' :
-            str_replace('\\', '', $event->properties['LOCATION'][0]->value);
+            trim(str_replace('\\', '', $event->properties['LOCATION'][0]->value));
     $eventrecord->uuid = $event->properties['UID'][0]->value;
     $eventrecord->timemodified = time();