From c765b77757f5fff04998232fd45d401b48288102 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Jan 2020 14:34:04 +0100 Subject: [PATCH] Fix Invalid characters passed for attempted conversion (7.4) --- src/Object/AbstractObject.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Object/AbstractObject.php b/src/Object/AbstractObject.php index a3b2d48..0fa2689 100644 --- a/src/Object/AbstractObject.php +++ b/src/Object/AbstractObject.php @@ -429,8 +429,8 @@ public function getFactor() */ public function setForeColor($value) { - if (preg_match('`\#[0-9A-F]{6}`', $value)) { - $this->foreColor = hexdec($value); + if (preg_match('`\#([0-9A-F]{6})`', $value, $reg)) { + $this->foreColor = hexdec($reg[1]); } elseif (is_numeric($value) && $value >= 0 && $value <= 16777125) { $this->foreColor = intval($value); } else { @@ -460,8 +460,8 @@ public function getForeColor() */ public function setBackgroundColor($value) { - if (preg_match('`\#[0-9A-F]{6}`', $value)) { - $this->backgroundColor = hexdec($value); + if (preg_match('`\#([0-9A-F]{6})`', $value, $reg)) { + $this->backgroundColor = hexdec($reg[1]); } elseif (is_numeric($value) && $value >= 0 && $value <= 16777125) { $this->backgroundColor = intval($value); } else {