diff options
| author | plegall <plg@piwigo.org> | 2015-02-17 12:38:35 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2015-02-17 12:38:35 +0000 |
| commit | f57bea42b7a78e7fc367d82f2bb1d7a0cb825e1e (patch) | |
| tree | eb167f6a5026e22c259b7abe3fde6ae1da8af6f4 | |
| parent | 22b295ff8d5eec12a8bcdfd865ab79d83a9f4d68 (diff) | |
merge r30979 from trunk to branch 2.7
bug 3201: accept - in plugin directory name (identifier)
git-svn-id: http://piwigo.org/svn/branches/2.7@30980 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | admin/plugin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/plugin.php b/admin/plugin.php index 82939b35a..dd6d989e9 100644 --- a/admin/plugin.php +++ b/admin/plugin.php @@ -46,7 +46,7 @@ if (count($sections)<2) $plugin_id = $sections[0]; -if (!preg_match('/^\w+$/', $plugin_id)) +if (!preg_match('/^[\w-]+$/', $plugin_id)) { die('Invalid plugin identifier'); } |