Merge pull request #8667 from MrPetovan/bug/8664-config-template-nofilter

Remove HTML escaping in config file template, add quote escaping
This commit is contained in:
Michael Vogel 2020-05-20 08:19:35 +02:00 committed by GitHub
commit 37d95f7727
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -7,10 +7,10 @@
return [ return [
'database' => [ 'database' => [
'hostname' => '{{$dbhost}}', 'hostname' => '{{$dbhost|escape:'quotes' nofilter}}',
'username' => '{{$dbuser}}', 'username' => '{{$dbuser|escape:'quotes' nofilter}}',
'password' => '{{$dbpass}}', 'password' => '{{$dbpass|escape:'quotes' nofilter}}',
'database' => '{{$dbdata}}', 'database' => '{{$dbdata|escape:'quotes' nofilter}}',
'charset' => 'utf8mb4', 'charset' => 'utf8mb4',
], ],
@ -21,19 +21,19 @@ return [
// **************************************************************** // ****************************************************************
'config' => [ 'config' => [
'php_path' => '{{$phpath}}', 'php_path' => '{{$phpath|escape:'quotes' nofilter}}',
'admin_email' => '{{$adminmail}}', 'admin_email' => '{{$adminmail|escape:'quotes' nofilter}}',
'sitename' => 'Friendica Social Network', 'sitename' => 'Friendica Social Network',
'hostname' => '{{$hostname}}', 'hostname' => '{{$hostname|escape:'quotes' nofilter}}',
'register_policy' => \Friendica\Module\Register::OPEN, 'register_policy' => \Friendica\Module\Register::OPEN,
'max_import_size' => 200000, 'max_import_size' => 200000,
], ],
'system' => [ 'system' => [
'urlpath' => '{{$urlpath}}', 'urlpath' => '{{$urlpath|escape:'quotes' nofilter}}',
'url' => '{{$baseurl}}', 'url' => '{{$baseurl|escape:'quotes' nofilter}}',
'ssl_policy' => {{$sslpolicy}}, 'ssl_policy' => {{$sslpolicy|escape:'quotes' nofilter}},
'basepath' => '{{$basepath}}', 'basepath' => '{{$basepath|escape:'quotes' nofilter}}',
'default_timezone' => '{{$timezone}}', 'default_timezone' => '{{$timezone|escape:'quotes' nofilter}}',
'language' => '{{$language}}', 'language' => '{{$language|escape:'quotes' nofilter}}',
], ],
]; ];