moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-62914-master' of git://github.com/lameze/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2018-08-28 23:14:15 +02:00
commit 770fc03ef6
3 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/bennu/iCalendar_components.php
View file

@ -686,6 +686,7 @@ class iCalendar_standard extends iCalendar_component {
'RDATE' => RFC2445_OPTIONAL,
'RRULE' => RFC2445_OPTIONAL,
'TZNAME' => RFC2445_OPTIONAL,
'TZURL' => RFC2445_OPTIONAL,
RFC2445_XNAME => RFC2445_OPTIONAL,
);
parent::__construct();

11
lib/bennu/iCalendar_properties.php
View file

@ -1466,7 +1466,18 @@ class iCalendar_property_tzoffsetto extends iCalendar_property {
}
}
class iCalendar_property_tzurl extends iCalendar_property {
var $name = 'TZURL';
var $val_type = RFC2445_TYPE_URI;
function __construct() {
parent::__construct();
$this->valid_parameters = array(
RFC2445_XNAME => RFC2445_OPTIONAL
);
}
}
#######################
/*

3
lib/bennu/readme_moodle.txt
View file

@ -25,4 +25,5 @@ Changelog
6/ MDL-49032: fixed rfc2445_fold() to fix incorrect RFC2445_WSP definition (16 Sep 2015)
7/ added timestamp_to_date function to support zero duration events (16 Sept 2015)
8/ Updated \iCalendar_event::invariant_holds() to allow for same dtstart and dtend timestamps (13 July 2017)
9/ MDL-60391: replace create_function() with lambda function for PHP 7.2 compatibility (13 Oct 2017)
9/ MDL-60391: replace create_function() with lambda function for PHP 7.2 compatibility (13 Oct 2017)
10/ MDL-62914: added handling for TZURL property (13 July 2018)