diff options
author | Robin Appelman <icewind@owncloud.com> | 2014-03-11 13:04:20 +0100 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2014-03-11 13:04:20 +0100 |
commit | d55c7223a96e259543d28f53474a17525fdac25f (patch) | |
tree | c2acd009ea815b0df04d608235a785990cea3f4d /lib/private/db/mdb2schemareader.php | |
parent | 06c6163265bf10e7aa84c2621d58323b3ad94963 (diff) | |
parent | c1cb9ee9b0b19e17ddde046642fa01d52cda63bf (diff) | |
download | nextcloud-server-d55c7223a96e259543d28f53474a17525fdac25f.tar.gz nextcloud-server-d55c7223a96e259543d28f53474a17525fdac25f.zip |
Merge branch 'master' into foldersize-reuse
Conflicts:
lib/private/files/cache/homecache.php
Diffstat (limited to 'lib/private/db/mdb2schemareader.php')
-rw-r--r-- | lib/private/db/mdb2schemareader.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php index f9a76786c3e..1c16d03eab2 100644 --- a/lib/private/db/mdb2schemareader.php +++ b/lib/private/db/mdb2schemareader.php @@ -41,7 +41,9 @@ class MDB2SchemaReader { */ public function loadSchemaFromFile($file) { $schema = new \Doctrine\DBAL\Schema\Schema(); + $loadEntities = libxml_disable_entity_loader(false); $xml = simplexml_load_file($file); + libxml_disable_entity_loader($loadEntities); foreach ($xml->children() as $child) { /** * @var \SimpleXMLElement $child |