Escaped delimiter in validationPattern

diff --git a/wcfsetup/install/files/lib/system/bbcode/BBCodeParser.class.php b/wcfsetup/install/files/lib/system/bbcode/BBCodeParser.class.php
index d1f662ee3c97adb274b5630e56be9c526c66ff31..b187c82cd470a09809358c023b3bf6072e5061d6 100644 (file)
--- a/wcfsetup/install/files/lib/system/bbcode/BBCodeParser.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/BBCodeParser.class.php
@@ -235,7 +235,7 @@ class BBCodeParser extends SingletonFactory {
        protected function isValidTagAttribute(array $tagAttributes, BBCodeAttribute $definedTagAttribute) {
                if ($definedTagAttribute->validationPattern && isset($tagAttributes[$definedTagAttribute->attributeNo])) {
                        // validate attribute
-                       if (!preg_match('~'.$definedTagAttribute->validationPattern.'~i', $tagAttributes[$definedTagAttribute->attributeNo])) {
+                       if (!preg_match('~'.str_replace('~', '\~', $definedTagAttribute->validationPattern).'~i', $tagAttributes[$definedTagAttribute->attributeNo])) {
                                return false;
                        }
                }

diff --git a/wcfsetup/install/files/lib/system/option/OptionHandler.class.php b/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
index 0328fdeba9eb16d4a1baad10adc0185d80fa10c0..4ddc3fcdbcc550378217126ddec410cd4c344f5b 100644 (file)
--- a/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/option/OptionHandler.class.php
@@ -302,7 +302,7 @@ class OptionHandler implements IOptionHandler {
                
                // validate with pattern
                if ($option->validationPattern) {
-                       if (!preg_match('~'.$option->validationPattern.'~', $this->optionValues[$option->optionName])) {
+                       if (!preg_match('~'.str_replace('~', '\~', $option->validationPattern).'~', $this->optionValues[$option->optionName])) {
                                throw new UserInputException($option->optionName, 'validationFailed');
                        }
                }