Code
/
islandora
7
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

Merge pull request #624 from qadan/7.x-1.6-ISLANDORA-1461 

don't need to check for properly-formed XML when just getting the diff
pull/625/head
Nick Ruest 9 years ago
parent
68162ff8a0 908c848c08
commit
9d165b3d90
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      includes/solution_packs.inc

4
includes/solution_packs.inc
Unescape View File

@ -582,11 +582,11 @@ function islandora_check_object_status(AbstractObject $object_definition) {
$xslt->importStyleSheet($xsl); $xslt->importStyleSheet($xsl);
$object_definition_dom = new DOMDocument(); $object_definition_dom = new DOMDocument();
$object_definition_dom->preserveWhiteSpace = FALSE; $object_definition_dom->preserveWhiteSpace = FALSE;
$object_definition_dom->loadXML(str_replace('info:', 'http://', $ds->content)); $object_definition_dom->loadXML(str_replace('info:', 'http://', $ds->content), LIBXML_NOWARNING);
$object_definition_dom = $xslt->transformToDoc($object_definition_dom); $object_definition_dom = $xslt->transformToDoc($object_definition_dom);
$object_actual_dom = new DOMDocument(); $object_actual_dom = new DOMDocument();
$object_actual_dom->preserveWhiteSpace = FALSE; $object_actual_dom->preserveWhiteSpace = FALSE;
$object_actual_dom->loadXML(str_replace('info:', 'http://', $existing_object[$ds->id]->content)); $object_actual_dom->loadXML(str_replace('info:', 'http://', $existing_object[$ds->id]->content), LIBXML_NOWARNING);
$object_actual_dom = $xslt->transformToDoc($object_actual_dom); $object_actual_dom = $xslt->transformToDoc($object_actual_dom);
// Fedora changes the xml structure so we need to cannonize it. // Fedora changes the xml structure so we need to cannonize it.

Write Preview
Loading…
Cancel
Save