Browse files

Merge branch '1.8'

Conflicts:
	ChangeLog
	lib/Sabre/DAV/Version.php
  • Loading branch information...
2 parents 2d64b1c + a600936 commit 6c815a149693ba13ec864acb6ee62a8a8efa50a5 @evert evert committed Feb 27, 2014
Showing with 11 additions and 1 deletion.
  1. +10 −0 ChangeLog.md
  2. +1 −1 lib/Sabre/DAV/XMLUtil.php
View
10 ChangeLog.md
@@ -90,6 +90,10 @@ ChangeLog
* Added: Issue #358, adding a component=vevent parameter to the content-types
for calendar objects, if the caldav backend provides this info.
+1.8.10 (????-??-??)
+-------------------
+* includes changes from version 1.7.12.
+
1.8.9 (2014-02-26)
------------------
@@ -177,6 +181,12 @@ ChangeLog
greater flexiblity.
+1.7.12 (????-??-??)
+-------------------
+
+* Fixed: Restoring old setting after changing libxml_disable_entity_loader.
+
+
1.7.11 (2014-02-26)
-------------------
View
2 lib/Sabre/DAV/XMLUtil.php
@@ -134,7 +134,7 @@ static function loadDOMDocument($xml) {
// Restoring old mechanism for error handling
if ($oldErrorSetting===false) libxml_use_internal_errors(false);
- if ($oldEntityLoaderSetting===false) libxml_disable_entity_loader(true);
+ if ($oldEntityLoaderSetting===false) libxml_disable_entity_loader(false);
return $dom;

0 comments on commit 6c815a1

Please sign in to comment.