ISLANDORA-193 Resolve merge conflict

14 years ago · b170b65d8b
1 changed files with 6 additions and 6 deletions
--- a/XMLDatastream.inc
+++ b/XMLDatastream.inc
@ -96,13 +96,13 @@ abstract class XMLDatastream {
    $this->pid = $pid;
    $this->dsid = $dsid;
    if ($xmlStr !== NULL) { 
-      if(is_object($xmlStr) && get_class($xmlStr) == 'DOMDocument'){
+      if(is_object($xmlStr) && get_class($xmlStr) == DOMDocument) {
        $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);
+      } 
    }
  }