From e54c2cade28f54cb02b64fa73295833a7841edbe Mon Sep 17 00:00:00 2001 From: Dan Garner Date: Tue, 17 Apr 2018 16:55:12 +0100 Subject: [PATCH] Better regex for replacing width/height/scale_override in the preview xibosignage/xibo#1479 --- lib/Widget/ModuleWidget.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Widget/ModuleWidget.php b/lib/Widget/ModuleWidget.php index b1be8ce72c..13646ddb2d 100644 --- 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