diff --git a/src/Core/Installer.php b/src/Core/Installer.php index 265dac905e..583ad5fe28 100644 --- a/src/Core/Installer.php +++ b/src/Core/Installer.php @@ -98,17 +98,17 @@ class Installer * Checks the current installation environment. There are optional and mandatory checks. * * @param string $baseurl The baseurl of Friendica - * @param string $phpath Optional path to the PHP binary + * @param string $phppath Optional path to the PHP binary * * @return bool if the check succeed * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public function checkEnvironment($baseurl, $phpath = null) + public function checkEnvironment($baseurl, $phppath = null) { $returnVal = true; - if (isset($phpath)) { - if (!$this->checkPHP($phpath)) { + if (isset($phppath)) { + if (!$this->checkPHP($phppath)) { $returnVal = false; } } @@ -165,7 +165,7 @@ class Installer '$dbpass' => $configCache->get('database', 'password'), '$dbdata' => $configCache->get('database', 'database'), - '$phpath' => $configCache->get('config', 'php_path'), + '$phppath' => $configCache->get('config', 'php_path'), '$adminmail' => $configCache->get('config', 'admin_email'), '$system_url' => $configCache->get('system', 'url'), diff --git a/view/templates/install/01_checks.tpl b/view/templates/install/01_checks.tpl index 26f47daad5..186582aa7f 100644 --- a/view/templates/install/01_checks.tpl +++ b/view/templates/install/01_checks.tpl @@ -27,7 +27,7 @@ {{/foreach}} -{{if $phpath}} +{{if $phppath}} {{/if}} diff --git a/view/templates/install/local.config.tpl b/view/templates/install/local.config.tpl index 753698a3f2..24f5fe6b84 100644 --- a/view/templates/install/local.config.tpl +++ b/view/templates/install/local.config.tpl @@ -21,7 +21,7 @@ return [ // **************************************************************** 'config' => [ - 'php_path' => '{{$phpath|escape:'quotes' nofilter}}', + 'php_path' => '{{$phppath|escape:'quotes' nofilter}}', 'admin_email' => '{{$adminmail|escape:'quotes' nofilter}}', 'sitename' => 'Friendica Social Network', 'register_policy' => \Friendica\Module\Register::OPEN,