diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-12-27 18:18:20 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-12-27 18:18:20 +0100 |
| commit | 90a77ba9d3e97718e9da7d1ee95ece4e756d26b7 (patch) | |
| tree | 1b6727bb4219256cedc3b269c657822c2e4329fc | |
| parent | ad251e4590744b0927019ae935c92c7101aa7678 (diff) | |
| download | forums-90a77ba9d3e97718e9da7d1ee95ece4e756d26b7.tar forums-90a77ba9d3e97718e9da7d1ee95ece4e756d26b7.tar.gz forums-90a77ba9d3e97718e9da7d1ee95ece4e756d26b7.tar.bz2 forums-90a77ba9d3e97718e9da7d1ee95ece4e756d26b7.tar.xz forums-90a77ba9d3e97718e9da7d1ee95ece4e756d26b7.zip | |
[ticket/security-203] Allow more characters for branch names
SECURITY-203
| -rw-r--r-- | phpBB/phpbb/version_helper.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index e2d90af04a..70a009ed3d 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -243,7 +243,7 @@ class version_helper * * @param bool $force_update Ignores cached data. Defaults to false. * @param bool $force_cache Force the use of the cache. Override $force_update. - * @return string Version info + * @return array Version info * @throws \RuntimeException */ public function get_versions_matching_stability($force_update = false, $force_cache = false) @@ -350,7 +350,7 @@ class version_helper { foreach ($versions_data as $branch => &$version_data) { - if (!preg_match('/^[0-9]+\.[0-9]+$/', $branch)) + if (!preg_match('/^[0-9a-z\-\.]+$/i', $branch)) { unset($versions_data[$branch]); continue; |