wait #4678 @1

diff --git a/app/Http/Controllers/API/FluidbookThemeAPIController.php b/app/Http/Controllers/API/FluidbookThemeAPIController.php
index fa3e19b4086d39e49fb318b519bd037108179c57..ddbe74045f21e27bed54d7ce9b1dc6760301915d 100644 (file)
--- 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 789995d1f3a801555ac399429f6497aac878307f..cd9bab8ad5fc74b9c9989158f7e77caf22edbbae 100644 (file)
--- 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) {