mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-29 19:50:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-36592-master' of git://github.com/ankitagarwal/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2012-11-20 16:42:52 +13:00
commit 4d7259e53d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/bennu/iCalendar_components.php
View File

@ -232,7 +232,7 @@ class iCalendar_component {
function unserialize($string) {
$string = rfc2445_unfold($string); // Unfold any long lines
$lines = explode(RFC2445_CRLF, $string); // Create an array of lines
$lines = preg_split("<".RFC2445_CRLF."|\n|\r>", $string, 0, PREG_SPLIT_NO_EMPTY); // Create an array of lines.
$components = array(); // Initialise a stack of components
$this->clear_errors();

3
lib/bennu/readme_moodle.txt
View File

@ -2,4 +2,5 @@ Description of Bennu library import - customised library by author, this version
modifications:
1/ removed ereg functions deprecated as of php 5.3 (18 Nov 2009)
2/ replaced mbstring functions with moodle textlib (28 Nov 2011)
2/ replaced mbstring functions with moodle textlib (28 Nov 2011)
3/ replaced explode in iCalendar_component::unserialize() with preg_split to support various line breaks (20 Nov 2012)