Merge branch 'master' into add_error_handling

Author: assertchris

source/functions.php

@@ -52,11 +52,10 @@ function defer($code) {
         ";
 
         $result = exec(
-            "php -r 'eval(base64_decode(\"" . base64_encode($defer) . "\"));'",
+            escapeshellcmd(PHP_BINARY) . " -r 'eval(base64_decode(\"" . base64_encode($defer) . "\"));'",
             $output
         );
 
-
         $return = @gzdecode(base64_decode($result));
 
         if ($return === false) {