Merge pull request #10040 from annando/file-permissions

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

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 4f2f2d99f3c9e0615781a6dff73b0ca4f8c9c676..2824b072c414e853d1abe51a19aa1d35946c75bd 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -192,7 +192,7 @@ class Installer
         */
        public function installDatabase($basePath)
        {
-               $result = DBStructure::update($basePath, false, true, true);
+               $result = DBStructure::install($basePath);
 
                if ($result) {
                        $txt = DI::l10n()->t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL;
@@ -463,6 +463,13 @@ class Installer
                );
                $returnVal = $returnVal ? $status : false;
 
+               $status = $this->checkFunction('proc_open',
+                       DI::l10n()->t('Program execution functions'),
+                       DI::l10n()->t('Error: Program execution functions required but not enabled.'),
+                       true
+               );
+               $returnVal = $returnVal ? $status : false;
+
                $status = $this->checkFunction('json_encode',
                        DI::l10n()->t('JSON PHP module'),
                        DI::l10n()->t('Error: JSON PHP module required but not installed.'),
@@ -498,7 +505,7 @@ class Installer
                        $help = DI::l10n()->t('The web installer needs to be able to create a file called "local.config.php" in the "config" folder of your web server and it is unable to do so.') . EOL;
                        $help .= DI::l10n()->t('This is most often a permission setting, as the web server may not be able to write files in your folder - even if you can.') . EOL;
                        $help .= DI::l10n()->t('At the end of this procedure, we will give you a text to save in a file named local.config.php in your Friendica "config" folder.') . EOL;
-                       $help .= DI::l10n()->t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.') . EOL;
+                       $help .= DI::l10n()->t('You can alternatively skip this procedure and perform a manual installation. Please see the file "doc/INSTALL.md" for instructions.') . EOL;
                }
 
                $this->addCheck(DI::l10n()->t('config/local.config.php is writable'), $status, false, $help);