diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-12-15 03:06:57 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-12-15 03:06:57 +0000 |
| commit | 522d52efe46c8617c1bd77af092d506229e44abf (patch) | |
| tree | a910d401b5ac3f4a8c843e968248e3cb32876fe1 /phpBB/includes/acp/acp_database.php | |
| parent | c3a2557108e5cf544c6c49a9ec6e1479f0e3317d (diff) | |
| download | forums-522d52efe46c8617c1bd77af092d506229e44abf.tar forums-522d52efe46c8617c1bd77af092d506229e44abf.tar.gz forums-522d52efe46c8617c1bd77af092d506229e44abf.tar.bz2 forums-522d52efe46c8617c1bd77af092d506229e44abf.tar.xz forums-522d52efe46c8617c1bd77af092d506229e44abf.zip | |
- nobody found this bug :D
git-svn-id: file:///svn/phpbb/trunk@6768 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_database.php')
| -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 7da2044471..dbf78daad7 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -72,7 +72,7 @@ class acp_database $time = time(); - $filename = 'backup_' . $time; + $filename = 'backup_' . $time . '_' . unique_id(); // We set up the info needed for our on-the-fly creation :D switch ($format) @@ -856,8 +856,8 @@ class acp_database for ($i = 0; $i < $i_num_fields; $i++) { - $ary_type[$i] = ocicolumntype($result, $i); - $ary_name[$i] = ocicolumnname($result, $i); + $ary_type[$i] = ocicolumntype($result, $i + 1); + $ary_name[$i] = ocicolumnname($result, $i + 1); } while ($row = $db->sql_fetchrow($result)) @@ -1216,7 +1216,7 @@ class acp_database $dh = opendir($dir); while (($file = readdir($dh)) !== false) { - if (preg_match('#^backup_(\d{10,})\.(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); |