Remove php_path duplicate in auto-install
authorPhilipp Holzer <admin@philipp.info>
Sat, 13 Apr 2019 20:51:45 +0000 (22:51 +0200)
committerPhilipp Holzer <admin@philipp.info>
Sun, 14 Apr 2019 12:24:00 +0000 (14:24 +0200)
src/Core/Console/AutomaticInstallation.php

index 2aacc11..561b05a 100644 (file)
@@ -129,6 +129,7 @@ HELP;
                        $configCache->set('database', 'password',
                                $this->getOption(['P', 'dbpass'],
                                        ($save_db) ? getenv('MYSQL_PASSWORD') : ''));
+
                        $php_path = $this->getOption(['b', 'phppath'], !empty('FRIENDICA_PHP_PATH') ? getenv('FRIENDICA_PHP_PATH') : null);
                        if (!empty($php_path)) {
                                $configCache->set('config', 'php_path', $php_path);
@@ -150,10 +151,6 @@ HELP;
                        if (!empty($basepath)) {
                                $configCache->set('system', 'basepath', $basepath);
                        }
-                       $php_path = $this->getOption(['B', 'phppath'], !empty(getenv('FRIENDICA_PHP_PATH')) ? getenv('FRIENDICA_PHP_PATH') : null);
-                       if (!empty($php_path)) {
-                               $configCache->set('config', 'php_path', $php_path);
-                       }
 
                        $url = $this->getOption(['U', 'url'], !empty(getenv('FRIENDICA_URL')) ? getenv('FRIENDICA_URL') : null);