diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-12-23 02:34:18 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-12-23 02:34:18 +0000 |
| commit | 7b86f3b9a89682727685062a9544eadb191d60a5 (patch) | |
| tree | 20f7102113908cf49cc50cd70188062198dd1d23 | |
| parent | 803f64c7248d87e9e9508349c699b0f442556d55 (diff) | |
| download | forums-7b86f3b9a89682727685062a9544eadb191d60a5.tar forums-7b86f3b9a89682727685062a9544eadb191d60a5.tar.gz forums-7b86f3b9a89682727685062a9544eadb191d60a5.tar.bz2 forums-7b86f3b9a89682727685062a9544eadb191d60a5.tar.xz forums-7b86f3b9a89682727685062a9544eadb191d60a5.zip | |
#6502
git-svn-id: file:///svn/phpbb/trunk@6791 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 7949845862..4cbbdf750b 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -1094,7 +1094,7 @@ class acp_database $delete = request_var('delete', ''); $file = request_var('file', ''); - preg_match('#^(backup_\d{10,})\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches); + preg_match('#^backup_\d{10,}_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches); $file_name = $phpbb_root_path . 'store/' . $matches[0]; if (!(file_exists($file_name) && is_readable($file_name))) @@ -1110,7 +1110,7 @@ class acp_database $data = file_get_contents($file_name); - switch ($matches[2]) + switch ($matches[1]) { case 'sql.bz2': $data = bzdecompress($data); @@ -1126,7 +1126,7 @@ class acp_database { $name = $matches[0]; - switch ($matches[2]) + switch ($matches[1]) { case 'sql': $mimetype = 'text/x-sql'; @@ -1215,7 +1215,7 @@ class acp_database $dh = opendir($dir); while (($file = readdir($dh)) !== false) { - if (preg_match('#^backup_(\d{10,})_(?:[a-z\d]{16})\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches)) + if (preg_match('#^backup_(\d{10,})_[a-z\d]{16}\.(sql(?:\.(?:gz|bz2))?)$#', $file, $matches)) { $supported = in_array($matches[2], $methods); |