Merge pull request #5599 from annando/postupdate

[friendica.git] / src / Core / Install.php

diff --git a/src/Core/Install.php b/src/Core/Install.php
index 663195e104f208602d07fe41253aea4aa2449aed..ec33ef9634d77c0440dc74a4aac4b7111f263435 100644 (file)
--- a/src/Core/Install.php
+++ b/src/Core/Install.php
@@ -42,7 +42,7 @@ class Install extends BaseObject
 \r
                self::checkImagick($checks);\r
 \r
-               self::checkHtConfig($checks);\r
+               self::checkLocalIni($checks);\r
 \r
                self::checkSmarty3($checks);\r
 \r
@@ -54,7 +54,7 @@ class Install extends BaseObject
 \r
                $checkspassed = array_reduce($checks,\r
                        function ($v, $c) {\r
-                               if ($c['require']) {\r
+                               if (!empty($c['require'])) {\r
                                        $v = $v && $c['status'];\r
                                }\r
                                return $v;\r
@@ -80,7 +80,7 @@ class Install extends BaseObject
         * @param string        $adminmail      Mail-Adress of the administrator\r
         * @param int           $rino           Rino-enabled (1 = true, 0 = false)\r
         */\r
-       public static function install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail, $rino = 1)\r
+       public static function install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail)\r
        {\r
                $tpl = get_markup_template('local.ini.tpl');\r
                $txt = replace_macros($tpl,[\r
@@ -93,7 +93,6 @@ class Install extends BaseObject
                        '$urlpath' => $urlpath,\r
                        '$phpath' => $phpath,\r
                        '$adminmail' => $adminmail,\r
-                       '$rino' => $rino\r
                ]);\r
 \r
                $result = file_put_contents('config/local.ini.php', $txt);\r
@@ -309,7 +308,7 @@ class Install extends BaseObject
         *\r
         * @param array $checks The list of all checks (by-ref parameter!)\r
         */\r
-       public static function checkHtConfig(&$checks)\r
+       public static function checkLocalIni(&$checks)\r
        {\r
                $status = true;\r
                $help = "";\r
@@ -376,7 +375,7 @@ class Install extends BaseObject
                                $error_msg = [];\r
                                $error_msg['head'] = L10n::t('Error message from Curl when fetching');\r
                                $error_msg['url'] = $test['redirect_url'];\r
-                               $error_msg['msg'] = $test['error'];\r
+                               $error_msg['msg'] = defaults($test, 'error', '');\r
                        }\r
                        self::addCheck($checks, L10n::t('Url rewrite is working'), $status, true, $help, $error_msg);\r
                } else {\r