From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Wed, 15 Sep 2021 18:02:35 +0000 (+0200)
Subject: wait #4678 @1
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=67019bdf2894b115ecd7a2f1b41c6249b3122ac1;p=fluidbook-toolbox.git

wait #4678 @1
---

diff --git a/app/Http/Controllers/API/FluidbookThemeAPIController.php b/app/Http/Controllers/API/FluidbookThemeAPIController.php
index fa3e19b40..ddbe74045 100644
--- a/app/Http/Controllers/API/FluidbookThemeAPIController.php
+++ b/app/Http/Controllers/API/FluidbookThemeAPIController.php
@@ -40,7 +40,11 @@ class FluidbookThemeAPIController extends Controller
                     $v = 0;
                 }
             } else if ($field instanceof Color) {
-                $v = FluidbookTheme::_colorToWS3($v);
+                if ($v === '' && $field->getAttribute('allows_empty')) {
+
+                } else {
+                    $v = FluidbookTheme::_colorToWS3($v);
+                }
             } else if ($field instanceof Files) {
                 continue;
             }
diff --git a/app/Models/FluidbookTheme.php b/app/Models/FluidbookTheme.php
index 789995d1f..cd9bab8ad 100644
--- a/app/Models/FluidbookTheme.php
+++ b/app/Models/FluidbookTheme.php
@@ -615,8 +615,9 @@ class FluidbookTheme extends CubistMagicAbstractModel
 
     public static function _colorToWS3($data)
     {
+        $data = trim($data);
         if (!isset(self::$_colorToWS3Cache[$data])) {
-            if (strlen($data) < 6) {
+            if ($data !== '' && strlen($data) < 6) {
                 $data = str_repeat('0', 6 - strlen($data)) . $data;
             }
             if (strlen($data) === 6) {