FIXED : #282 : problem converting docx to pdf

Progi1984 · Progi1984 · commit 71b4ac9c56f8 · 2014-06-17T15:48:39.000+02:00
PHP Catchable fatal error: Argument 2 passed to DOMXPath::query() must be an instance of DOMNode, null given, called in /var/www/xxx/PhpWord/Reader/Word2007.php on line 145 and defined in /var/www/xxx/PhpWord/Shared/XMLReader.php on line 99, referer: XXX
diff --git a/src/PhpWord/Shared/XMLReader.php b/src/PhpWord/Shared/XMLReader.php
@@ -96,7 +96,11 @@ public function getElements($path, \DOMElement $contextNode = null)
             $this->xpath = new \DOMXpath($this->dom);
         }
 
-        return $this->xpath->query($path, $contextNode);
+        if (is_null($contextNode)) {
+            return $this->xpath->query($path);
+        } else {
+            return $this->xpath->query($path, $contextNode);
+        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,11 @@ public function getElements($path, \DOMElement $contextNode = null)`
`96`	`96`	`$this->xpath = new \DOMXpath($this->dom);`
`97`	`97`	`}`
`98`	`98`
`99`		`- return $this->xpath->query($path, $contextNode);`
	`99`	`+ if (is_null($contextNode)) {`
	`100`	`+ return $this->xpath->query($path);`
	`101`	`+ } else {`
	`102`	`+ return $this->xpath->query($path, $contextNode);`
	`103`	`+ }`
`100`	`104`	`}`
`101`	`105`
`102`	`106`	`/**`