From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 29 Jun 2018 13:21:24 +0000 (+0200)
Subject: Merge branch '2.1' into 3.0
X-Git-Tag: 3.0.16~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=43723f2dca18bb75e9d8cbd5b367d083da1b64ed;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.1' into 3.0
---

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]).").");