mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24232 from nextcloud/backport/24211/stable20 

[stable20] Fix setting images through occ for theming
This commit is contained in:
Roeland Jago Douma 2020-11-20 10:04:30 +01:00 committed by GitHub
parent 78b62b6b65 c8e9694a69
commit 10086b3f43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/theming/lib/Command/UpdateConfig.php
View File

@ -94,7 +94,7 @@ class UpdateConfig extends Command {
return 0; return 0;
} }
if (!in_array($key, self::SUPPORTED_KEYS, true)) { if (!in_array($key, self::SUPPORTED_KEYS, true) && !in_array($key, self::SUPPORTED_IMAGE_KEYS, true)) {
$output->writeln('<error>Invalid config key provided</error>'); $output->writeln('<error>Invalid config key provided</error>');
return 1; return 1;
} }
@ -116,11 +116,12 @@ class UpdateConfig extends Command {
} }
if (in_array($key, self::SUPPORTED_IMAGE_KEYS, true)) { if (in_array($key, self::SUPPORTED_IMAGE_KEYS, true)) {
if (file_exists(__DIR__ . $value)) { if (strpos($value, '/') !== 0) {
$value = __DIR__ . $value; $output->writeln('<error>The image file needs to be provided as an absolute path: ' . $value . '.</error>');
return 1;
} }
if (!file_exists($value)) { if (!file_exists($value)) {
$output->writeln('<error>File could not be found: ' . $value . '</error>'); $output->writeln('<error>File could not be found: ' . $value . '.</error>');
return 1; return 1;
} }
$value = $this->imageManager->updateImage($key, $value); $value = $this->imageManager->updateImage($key, $value);