Simplify config.php_path access in App->proc_run

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index f5626761e59d5ac8327e4d7fb6ada1395f1137a4..f4f5545bb32d2ed86472a9479a76fb0796d11337 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -181,7 +181,10 @@ class App
 
                $this->process_id = uniqid('log', true);
 
-               startup();
+               set_time_limit(0);
+
+               // This has to be quite large to deal with embedded private photos
+               ini_set('pcre.backtrack_limit', 500000);
 
                $this->scheme = 'http';
 
@@ -863,7 +866,7 @@ class App
                        return;
                }
 
-               array_unshift($args, ((x($this->config, 'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php'));
+               array_unshift($args, $this->getConfigValue('config', 'php_path', 'php'));
 
                for ($x = 0; $x < count($args); $x ++) {
                        $args[$x] = escapeshellarg($args[$x]);
@@ -875,7 +878,7 @@ class App
                        return;
                }
 
-               if (Config::get('system', 'proc_windows')) {
+               if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
                        $resource = proc_open('cmd /c start /b ' . $cmdline, [], $foo, $this->get_basepath());
                } else {
                        $resource = proc_open($cmdline . ' &', [], $foo, $this->get_basepath());