Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'rewrites/app_get_baseurl_static' into develop

Browse source 
Signed-off-by: Roland Häder <roland@mxchange.org>

Conflicts:
	mod/admin.php
	mod/bookmarklet.php
	mod/community.php
	mod/contacts.php
	mod/crepair.php
	mod/editpost.php
	mod/events.php
	mod/install.php
	mod/lostpass.php
	mod/network.php
	mod/notify.php
	mod/suggest.php
	mod/uexport.php
	mod/videos.php
	view/theme/duepuntozero/config.php
	view/theme/frio/config.php
	view/theme/quattro/config.php
	view/theme/vier/config.php
This commit is contained in:
Roland Häder 2016-12-22 11:37:23 +01:00
commit 20e71d21a6
11 changed files with 44 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

1
mod/install.php
View file

@ -565,7 +565,6 @@ function check_imagik(&$checks) {
}
}
function manual_config(App &$a) {
$data = htmlentities($a->data['txt'],ENT_COMPAT,'UTF-8');
$o = t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');