clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13870 from annando/channel-languages 

Fix: Saving of channel languages
This commit is contained in:
Hypolite Petovan 2024-02-04 09:18:02 -05:00 committed by GitHub
parent b6e958fdcf 672186e549
commit d9d42105d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Content/Conversation/Repository/UserDefinedChannel.php
View File

@ -134,7 +134,7 @@ class UserDefinedChannel extends \Friendica\BaseRepository
'max-size' => $Channel->maxSize, 'max-size' => $Channel->maxSize,
'full-text-search' => $Channel->fullTextSearch, 'full-text-search' => $Channel->fullTextSearch,
'media-type' => $Channel->mediaType, 'media-type' => $Channel->mediaType,
'languages' => serialize($Channel->languages), 'languages' => !empty($Channel->languages) ? serialize($Channel->languages) : null,
'publish' => $Channel->publish, 'publish' => $Channel->publish,
'valid' => $this->isValid($Channel->fullTextSearch), 'valid' => $this->isValid($Channel->fullTextSearch),
]; ];

2
src/Module/Settings/Channels.php
View File

@ -101,7 +101,7 @@ class Channels extends BaseSettings
continue; continue;
} }
if (!array_diff((array)$request['languages'][$id], $channel_languages)) { if (!array_diff((array)$request['languages'][$id], $channel_languages) && (count((array)$request['languages'][$id]) == count($channel_languages))) {
$request['languages'][$id] = null; $request['languages'][$id] = null;
} }