Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-25 17:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into show_image_upload_limit

Browse source 
# Conflicts:
#	src/Util/Strings.php
#	view/lang/C/messages.po
This commit is contained in:
Marek Bachmann 2022-11-27 23:52:58 +01:00
commit a01872a117
72 changed files with 1605 additions and 1038 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Module/Admin/Site.php
View file

@ -325,8 +325,8 @@ class Site extends BaseAdmin
/* Installed langs */
$lang_choices = DI::l10n()->getAvailableLanguages();
if (strlen(DI::config()->get('system', 'directory_submit_url')) &&
!strlen(DI::config()->get('system', 'directory'))) {
if (DI::config()->get('system', 'directory_submit_url') &&
!DI::config()->get('system', 'directory')) {
DI::config()->set('system', 'directory', dirname(DI::config()->get('system', 'directory_submit_url')));
DI::config()->delete('system', 'directory_submit_url');
}