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 bc6680eb5274a00b22189036980f08279546426b..f5e458223405b2c834f587989b7c781bc5c698ca 100644 (file)
--- 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]).").");