eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-02-04 04:56:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix: Additional Collabora options not working correctly (#7481)

Browse source 
Signed-off-by: MrAn0nym <63542658+MrAn0nym@users.noreply.github.com>
Signed-off-by: Simon L. <szaimen@e.mail.de>
Co-authored-by: Simon L. <szaimen@e.mail.de>
Co-authored-by: Pablo Zmdl <57864086+pabzm@users.noreply.github.com>
This commit is contained in:
MrAn0nym 2026-01-29 14:29:15 +01:00 • committed by GitHub
parent 8ff8d7d11e
commit ffd8dac1b4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
php/src/Docker/DockerActionManager.php
View file

@ -420,7 +420,13 @@ readonly class DockerActionManager {
// Additional Collabora options
if ($this->configurationManager->collaboraAdditionalOptions !== '') {
$requestBody['Cmd'] = [$this->configurationManager->collaboraAdditionalOptions];
// Split the list of Collabora options, which are stored as a string but must be assigned as an array.
// To avoid problems with whitespace or dashes in option arguments we use a regular expression
// that splits the string at every position where a whitespace is followed by '--o:'.
// The leading whitespace is removed in the split but the following characters are not.
// Example: "--o:example_config1='some thing' --o:example_config2=something-else" -> ["--o:example_config1='some thing'", "--o:example_config2=something-else"]
$regEx = '/\s+(?=--o:)/';
$requestBody['Cmd'] = preg_split($regEx, rtrim($this->configurationManager->collaboraAdditionalOptions));
}
}