keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3004 from tobiasd/20161210-2932followup

Browse source 
add allowed protocols during installation
This commit is contained in:
Michael Vogel 2016-12-10 08:02:19 +01:00 committed by GitHub
commit b43691cc4b
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
htconfig.php
View file

@ -66,7 +66,7 @@ $a->config['system']['allowed_themes'] = 'quattro,vier,duepuntozero';
// default system theme
$a->config['system']['theme'] = 'duepuntozero';
$a->config['system']['theme'] = 'vier';
// By default allow pseudonyms
@ -80,4 +80,4 @@ $a->config['system']['no_regfullname'] = true;
$a->config['system']['directory'] = 'http://dir.friendi.ca';
// Allowed protocols in link URLs; HTTP protocols always are accepted
$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher');
$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher');

3
view/templates/htconfig.tpl
View file

@ -35,6 +35,9 @@ $a->config['php_path'] = '{{$phpath}}';
$a->path = '{{$urlpath}}';
// Allowed protocols in link URLs; HTTP protocols always are accepted
$a->config['system']['allowed_link_protocols'] = array('ftp', 'ftps', 'mailto', 'cid', 'gopher');
/* *********************************************************************
* The configuration below will be overruled by the admin panel.
* Changes made below will only have an effect if the database does