Merge pull request #10819 from MrPetovan/task/refactor-notifications

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

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 19247211cf3e8723ca76e63fc8f9cc8f47d5cac0..96fe941564b915f0d2e12b631ac53680bcd38007 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -557,11 +557,11 @@ class Installer
                $help = "";
                $error_msg = "";
                if (function_exists('curl_init')) {
-                       $fetchResult = DI::httpRequest()->fetchFull($baseurl . "/install/testrewrite");
+                       $fetchResult = DI::httpClient()->fetchFull($baseurl . "/install/testrewrite");
 
                        $url = Strings::normaliseLink($baseurl . "/install/testrewrite");
                        if ($fetchResult->getReturnCode() != 204) {
-                               $fetchResult = DI::httpRequest()->fetchFull($url);
+                               $fetchResult = DI::httpClient()->fetchFull($url);
                        }
 
                        if ($fetchResult->getReturnCode() != 204) {
@@ -605,14 +605,13 @@ class Installer
                
                if (!$tls) {
                        $help = DI::l10n()->t('The detection of TLS to secure the communication between the browser and the new Friendica server failed.');
-                       $help .= ' ' . DI::l10n()->t('It is highly encuraged to use Friendica only over a secured connection as sensible information like passwords will be transmitted.');
+                       $help .= ' ' . DI::l10n()->t('It is highly encouraged to use Friendica only over a secure connection as sensitive information like passwords will be transmitted.');
                        $help .= ' ' . DI::l10n()->t('Please ensure that the connection to the server is secure.');
                        $this->addCheck(DI::l10n()->t('No TLS detected'), $tls, false, $help);
                } else {
                        $this->addCheck(DI::l10n()->t('TLS detected'), $tls, false, '');
                }
 
-
                // TLS is not required
                return true;
        }