tilderadio
/
AzuraCast
mirror of https://github.com/AzuraCast/AzuraCast.git
4
0
Fork 0
Code Issues Releases Wiki Activity

#4223 -- Support both singular and multiple aliases.

This commit is contained in:
Buster "Silver Eagle" Neece 2021-06-01 19:53:24 -05:00
parent d338a8c986
commit e6c228bd3e
No known key found for this signature in database
GPG Key ID: 6D9E12FF03411F4E
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Radio/Frontend/Icecast.php
View File

@ -213,10 +213,19 @@ class Icecast extends AbstractFrontend
$customConfig = trim($frontendConfig->getCustomConfiguration() ?? '');
if (!empty($customConfig)) {
$custom_conf = $this->processCustomConfig($customConfig);
$customConfParsed = $this->processCustomConfig($customConfig);
if (false !== $custom_conf) {
$config = Utilities\Arrays::arrayMergeRecursiveDistinct($config, $custom_conf);
// Special handling for aliases.
if (isset($customConfParsed['paths']['alias'])) {
$alias = (array)$customConfParsed['paths']['alias'];
if (!is_numeric(key($alias))) {
$alias = [$alias];
}
$customConfParsed['paths']['alias'] = $alias;
}
if (false !== $customConfParsed) {
$config = Utilities\Arrays::arrayMergeRecursiveDistinct($config, $customConfParsed);
}
}