X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FInstaller.php;h=58cd713435bce804e0498759afccbf3271cfcf4d;hb=a83124209553318d1f044d543235114a82223ace;hp=85538d579f3b987a2e7d5478ea1bb0de75798042;hpb=acaf2f768e33be7fd62d259acd589df8e1403657;p=friendica.git

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 85538d579f..58cd713435 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -505,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);
@@ -546,7 +546,6 @@ class Installer
 	 *
 	 * @param string $baseurl The baseurl of the app
 	 * @return bool false if something required failed
-	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function checkHtAccess($baseurl)
 	{
@@ -563,14 +562,16 @@ class Installer
 
 			if ($fetchResult->getReturnCode() != 204) {
 				$status = false;
-				$help = DI::l10n()->t('Url rewrite in .htaccess is not working. Make sure you copied .htaccess-dist to .htaccess.');
+				$help = DI::l10n()->t('Url rewrite in .htaccess seems not working. Make sure you copied .htaccess-dist to .htaccess.');
+				$help .= DI::l10n()->t('In some circumstances (like running inside containers), you can skip this error.');
 				$error_msg = [];
 				$error_msg['head'] = DI::l10n()->t('Error message from Curl when fetching');
 				$error_msg['url'] = $fetchResult->getRedirectUrl();
 				$error_msg['msg'] = $fetchResult->getError();
 			}
 
-			$this->addCheck(DI::l10n()->t('Url rewrite is working'), $status, true, $help, $error_msg);
+			/// @TODO Required false because of cURL issues in containers - see https://github.com/friendica/docker/issues/134
+			$this->addCheck(DI::l10n()->t('Url rewrite is working'), $status, false, $help, $error_msg);
 		} else {
 			// cannot check modrewrite if libcurl is not installed
 			/// @TODO Maybe issue warning here?