diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-02-17 04:53:43 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-02-17 04:53:43 +0000 |
| commit | 9300c4090078949ccb314a4dab4f5f3d300fade8 (patch) | |
| tree | df9ecaf3af1cc3d5658f09328c174eec4a95cdd1 | |
| parent | bb7c0ded605826b8261c1b215253d7958a773777 (diff) | |
| download | forums-9300c4090078949ccb314a4dab4f5f3d300fade8.tar forums-9300c4090078949ccb314a4dab4f5f3d300fade8.tar.gz forums-9300c4090078949ccb314a4dab4f5f3d300fade8.tar.bz2 forums-9300c4090078949ccb314a4dab4f5f3d300fade8.tar.xz forums-9300c4090078949ccb314a4dab4f5f3d300fade8.zip | |
- used wrong heuristic to measure if we were done, using a different one now.
git-svn-id: file:///svn/phpbb/trunk@6999 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index b122f15f8f..0404ec73b7 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -388,15 +388,15 @@ class acp_database case 'mysql4': case 'mysqli': case 'sqlite': - while (!$eof($fp)) + while (($sql = $fgetd($fp, ";\n", $read, $seek, $eof)) !== false) { - $db->sql_query($fgetd($fp, ";\n", $read, $seek, $eof)); + $db->sql_query($sql); } break; case 'firebird': $delim = ";\n"; - while (!$eof($fp)) + while (($sql = $fgetd($fp, $delim, $read, $seek, $eof)) !== false) { $query = trim($fgetd($fp, $delim, $read, $seek, $eof)); if (substr($query, 0, 8) === 'SET TERM') @@ -409,9 +409,9 @@ class acp_database break; case 'postgres': - while (!$eof($fp)) + while (($sql = $fgetd($fp, $delim, $read, $seek, $eof)) !== false) { - $query = trim($fgetd($fp, ";\n", $read, $seek, $eof)); + $query = trim($sql); $db->sql_query($query); if (substr($query, 0, 4) == 'COPY') { @@ -426,17 +426,17 @@ class acp_database break; case 'oracle': - while (!$eof($fp)) + while (($sql = $fgetd($fp, "/\n", $read, $seek, $eof)) !== false) { - $db->sql_query($fgetd($fp, "/\n", $read, $seek, $eof)); + $db->sql_query($sql); } break; case 'mssql': case 'mssql_odbc': - while (!$eof($fp)) + while (($sql = $fgetd($fp, "GO\n", $read, $seek, $eof)) !== false) { - $db->sql_query($fgetd($fp, "GO\n", $read, $seek, $eof)); + $db->sql_query($sql); } break; } |