summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/dashboard/lib/Service/BackgroundService.php2
-rw-r--r--apps/dashboard/src/components/BackgroundSettings.vue5
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/dashboard/lib/Service/BackgroundService.php b/apps/dashboard/lib/Service/BackgroundService.php
index 2b59bef65d9..30e9d9fe3cb 100644
--- a/apps/dashboard/lib/Service/BackgroundService.php
+++ b/apps/dashboard/lib/Service/BackgroundService.php
@@ -107,7 +107,7 @@ class BackgroundService {
}
public function setShippedBackground($fileName) {
- if (!in_array($fileName, self::SHIPPED_BACKGROUNDS)) {
+ if (!array_key_exists($fileName, self::SHIPPED_BACKGROUNDS)) {
throw new \InvalidArgumentException('The given file name is invalid');
}
$this->config->setUserValue($this->userId, 'dashboard', 'background', $fileName);
diff --git a/apps/dashboard/src/components/BackgroundSettings.vue b/apps/dashboard/src/components/BackgroundSettings.vue
index accc094f523..65f70614d7b 100644
--- a/apps/dashboard/src/components/BackgroundSettings.vue
+++ b/apps/dashboard/src/components/BackgroundSettings.vue
@@ -95,6 +95,11 @@ export default {
async update(data) {
const background = data.type === 'custom' || data.type === 'default' ? data.type : data.value
this.backgroundImage = getBackgroundUrl(background, data.version)
+ if (data.type === 'color') {
+ this.$emit('updateBackground', data)
+ this.loading = false
+ return
+ }
const image = new Image()
image.onload = () => {
this.$emit('updateBackground', data)