Merge branch 'master' into 3.0

gsherwood · gsherwood · commit a360791fa7ed · 2017-02-28T09:30:22.000+11:00
diff --git a/src/Reports/Notifysend.php b/src/Reports/Notifysend.php
@@ -58,7 +58,7 @@ public function __construct()
     {
         $path = Config::getExecutablePath('notifysend');
         if ($path !== null) {
-            $this->path = $path;
+            $this->path = escapeshellcmd($path);
         }
 
         $timeout = Config::getConfigData('notifysend_timeout');
@@ -225,7 +225,7 @@ protected function notifyErrors($msg)
      */
     protected function getBasicCommand()
     {
-        $cmd  = escapeshellcmd($this->path);
+        $cmd  = $this->path;
         $cmd .= ' --category dev.validate';
         $cmd .= ' -h int:transient:1';
         $cmd .= ' -t '.(int) $this->timeout;

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function __construct()`
`58`	`58`	`{`
`59`	`59`	`$path = Config::getExecutablePath('notifysend');`
`60`	`60`	`if ($path !== null) {`
`61`		`- $this->path = $path;`
	`61`	`+ $this->path = escapeshellcmd($path);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`$timeout = Config::getConfigData('notifysend_timeout');`
`@@ -225,7 +225,7 @@ protected function notifyErrors($msg)`
`225`	`225`	`*/`
`226`	`226`	`protected function getBasicCommand()`
`227`	`227`	`{`
`228`		`- $cmd = escapeshellcmd($this->path);`
	`228`	`+ $cmd = $this->path;`
`229`	`229`	`$cmd .= ' --category dev.validate';`
`230`	`230`	`$cmd .= ' -h int:transient:1';`
`231`	`231`	`$cmd .= ' -t '.(int) $this->timeout;`