From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sun, 24 Mar 2019 17:15:15 +0000 (+0100)
Subject: Merge branch '3.0'
X-Git-Tag: 3.1.9~13
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fc281a4ebac779c3d422626c8b653b33537355c0;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '3.0'
---

fc281a4ebac779c3d422626c8b653b33537355c0
diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/ColorUtil.js
index 0a0b78db43,a28fe785af..6555c8b4b3
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/ColorUtil.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/ColorUtil.js
@@@ -197,7 -48,7 +197,7 @@@ define([], function () 
  			var charList = "0123456789ABCDEF";
  			
  			if (g === undefined) {
- 				if (r.toString().match(/^rgba?\((\d+), ?(\d+), ?(d\+)(?:, ?[0-9.]+)?\)$/)) {
 -				if (r.match(/^rgba?\((\d+), ?(\d+), ?(\d+)(?:, ?[0-9.]+)?\)$/)) {
++				if (r.toString().match(/^rgba?\((\d+), ?(\d+), ?(\d+)(?:, ?[0-9.]+)?\)$/)) {
  					r = RegExp.$1;
  					g = RegExp.$2;
  					b = RegExp.$3;