aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorRuben Calvo <rubencm@gmail.com>2018-10-30 22:56:20 +0000
committerRuben Calvo <rubencm@gmail.com>2018-10-30 22:56:20 +0000
commitfa1fd316fe878197db4e0a390722053829e2e317 (patch)
tree961b54ecb7e78fc8dc0340e31a6d56c8d0e8a1f1 /phpBB/includes/acp
parentbab86aac7fac57af6f40d327fb04970b2aecd158 (diff)
downloadforums-fa1fd316fe878197db4e0a390722053829e2e317.tar
forums-fa1fd316fe878197db4e0a390722053829e2e317.tar.gz
forums-fa1fd316fe878197db4e0a390722053829e2e317.tar.bz2
forums-fa1fd316fe878197db4e0a390722053829e2e317.tar.xz
forums-fa1fd316fe878197db4e0a390722053829e2e317.zip
[ticket/15860] Fix regexp
PHPBB3-15860
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_database.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index 91d49a45b0..19c4f6e4f1 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -203,7 +203,7 @@ class acp_database
$file = $request->variable('file', '');
$download = $request->variable('download', '');
- if (!preg_match('#^backup_\d{10,}_(?:[a-z\d]{16}|[a-z\d]{32})+\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches))
+ if (!preg_match('#^backup_\d{10,}_(?:[a-z\d]{16}|[a-z\d]{32})\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches))
{
trigger_error($user->lang['BACKUP_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
}
@@ -402,7 +402,7 @@ class acp_database
{
while (($file = readdir($dh)) !== false)
{
- if (preg_match('#^backup_(\d{10,})_[a-z\d]+\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches))
+ if (preg_match('#^backup_(\d{10,})_(?:[a-z\d]{16}|[a-z\d]{32})\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches))
{
if (in_array($matches[2], $methods))
{