From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Thu, 12 Jul 2018 02:24:52 +0000 (-0400)
Subject: Fix segfault in PHP 5.6 parsing INI strings
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b3439871201ab5c8a8f14333ab1d334a68c299e6;p=friendica.git

Fix segfault in PHP 5.6 parsing INI strings

- add documentation to generated local.ini.php file
---

diff --git a/view/templates/local.ini.tpl b/view/templates/local.ini.tpl
index 632b34e5a7..109a732301 100644
--- a/view/templates/local.ini.tpl
+++ b/view/templates/local.ini.tpl
@@ -1,5 +1,8 @@
 <?php return <<<INI
 
+; If you're unsure about what any of the config keys below do, please check the config/defaults.ini.php for detailed
+; documentation of their data type and behavior.
+
 [database]
 hostname = {{$dbhost}}
 username = {{$dbuser}}
@@ -33,11 +36,11 @@ language = {{$language}}
 allowed_themes = vier,quattro,duepuntozero,smoothly,frio
 theme = vier
 
-allowed_link_protocols[] = ftp
-allowed_link_protocols[] = ftps
-allowed_link_protocols[] = mailto
-allowed_link_protocols[] = cid
-allowed_link_protocols[] = gopher
+allowed_link_protocols[0] = ftp
+allowed_link_protocols[1] = ftps
+allowed_link_protocols[2] = mailto
+allowed_link_protocols[3] = cid
+allowed_link_protocols[4] = gopher
 
 maximagesize = 800000