Merge pull request #368 from dasgarner/bugfix/1.8.9-pack2

Better regex for replacing width/height/scale_override in the preview
xibosignage · Apr 18, 2018 · 2e3ff97 · 2e3ff97
2 parents b62b8a2 + e54c2ca
commit 2e3ff97
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/Widget/ModuleWidget.php b/lib/Widget/ModuleWidget.php
@@ -1458,9 +1458,9 @@ public final function getResourceOrCache($displayId, $region = null)
             $previewHeight = $this->getSanitizer()->getDouble('height', 0);
             $scaleOverride = $this->getSanitizer()->getDouble('scale_override', 0);
 
-            $resource = preg_replace('/"previewWidth":(\d*?),/', '"previewWidth":' . $previewWidth . ',', $resource);
-            $resource = preg_replace('/"previewHeight":(\d*?),/', '"previewHeight":' . $previewHeight . ',', $resource);
-            $resource = preg_replace('/"scaleOverride":(\d*?),/', '"scaleOverride":' . $scaleOverride . ',', $resource);
+            $resource = preg_replace('/"previewWidth":([-+]?[0-9]*\.?[0-9]+)/', '"previewWidth":' . $previewWidth, $resource);
+            $resource = preg_replace('/"previewHeight":([-+]?[0-9]*\.?[0-9]+)/', '"previewHeight":' . $previewHeight, $resource);
+            $resource = preg_replace('/"scaleOverride":([-+]?[0-9]*\.?[0-9]+)/', '"scaleOverride":' . $scaleOverride, $resource);
         }
 
         // Return the resource