From 43723f2dca18bb75e9d8cbd5b367d083da1b64ed Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 29 Jun 2018 15:21:24 +0200 Subject: [PATCH] Merge branch '2.1' into 3.0 --- .../plugin/AbstractOptionPackageInstallationPlugin.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php index bc6680eb52..f5e4582234 100644 --- a/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php +++ b/wcfsetup/install/files/lib/system/package/plugin/AbstractOptionPackageInstallationPlugin.class.php @@ -285,7 +285,7 @@ abstract class AbstractOptionPackageInstallationPlugin extends AbstractXMLPackag * @inheritDoc */ protected function validateOption(array $data) { - if (!preg_match("/^[\w-\.]+$/", $data['name'])) { + if (!preg_match("/^[\w\-\.]+$/", $data['name'])) { $matches = []; preg_match_all("/(\W)/", $data['name'], $matches); throw new SystemException("The option '".$data['name']."' has at least one non-alphanumeric character (underscore is permitted): (".implode("), ( ", $matches[1]).")."); -- 2.20.1