Browse Source

ISLANDORA-193 Resolve merge conflict

pull/105/head
Alexander O'Neill 14 years ago
parent
commit
b170b65d8b
  1. 12
      XMLDatastream.inc

12
XMLDatastream.inc

@ -95,14 +95,14 @@ abstract class XMLDatastream {
$this->pid = $pid; $this->pid = $pid;
$this->dsid = $dsid; $this->dsid = $dsid;
if ($xmlStr !== NULL) { if ($xmlStr !== NULL) {
if(is_object($xmlStr) && get_class($xmlStr) == 'DOMDocument'){ if(is_object($xmlStr) && get_class($xmlStr) == DOMDocument) {
$this->xml = $xmlStr; $this->xml = $xmlStr;
}else{
$this->xml = new DOMDocument('1.0', 'iso-8859-1');
$this->xml->loadXML($xmlStr);
} }
else {
$this->xml = new DOMDocument();
$this->xml->loadXML($xmlStr);
}
} }
} }

Loading…
Cancel
Save