]> git.mxchange.org Git - friendica.git/commitdiff
spelling: phppath
authorJosh Soref <2119212+jsoref@users.noreply.github.com>
Sun, 26 Mar 2023 22:38:03 +0000 (18:38 -0400)
committerJosh Soref <2119212+jsoref@users.noreply.github.com>
Mon, 27 Mar 2023 00:04:07 +0000 (20:04 -0400)
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
src/Core/Installer.php
view/templates/install/01_checks.tpl
view/templates/install/local.config.tpl

index 265dac905e8776a57aa66708b77ea22f9e1ad4a7..583ad5fe28e7f5e04f3cf9d177d456b95fd90526 100644 (file)
@@ -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'),
index 26f47daad53705c6e40c9e30d25518639286da47..186582aa7f70c5c2c7bf9bcf05fbfe8d171f9962 100644 (file)
@@ -27,7 +27,7 @@
 {{/foreach}}
 </table>
 
-{{if $phpath}}
+{{if $phppath}}
        <input type="hidden" name="config-php_path" value="{{$php_path}}">
 {{/if}}
 
index 753698a3f2251bab55e87aa7c791e5cf35952b42..24f5fe6b8481f1878fd0a3ac794a5944ecf1c51b 100644 (file)
@@ -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,