Merge pull request #41 from jgornick/escape-all-arguments

Update getCommand to escape all arguments.
mikehaertl · Apr 15, 2014 · aa59bcb · aa59bcb
2 parents bb77e17 + 95f78e1
commit aa59bcb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/WkHtmlToPdf.php b/WkHtmlToPdf.php
@@ -182,7 +182,7 @@ public function setPageOptions($options=array())
 
     /**
      * @param array $options list of options as name/value pairs
-     * 
+     *
      * @return array options processed
      */
     public function processOptions($options=array())
@@ -264,13 +264,13 @@ public function getTmpDir()
      */
     public function getCommand($filename)
     {
-        $command = $this->enableEscaping ? escapeshellarg($this->getBin()) : $this->getBin();
+        $command = $this->escape($this->getBin());
 
         $command .= $this->renderOptions($this->options);
 
         foreach($this->objects as $object)
         {
-            $command .= ' '.$object['input'];
+            $command .= ' '.$this->escape($object['input']);
             unset($object['input']);
             $command .= $this->renderOptions($object);
         }