spelling: phppath
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
This commit is contained in:
parent
68a5a99d8b
commit
04cbbcd2ff
|
@ -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'),
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
{{/foreach}}
|
||||
</table>
|
||||
|
||||
{{if $phpath}}
|
||||
{{if $phppath}}
|
||||
<input type="hidden" name="config-php_path" value="{{$php_path}}">
|
||||
{{/if}}
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue