nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed bug #491051 - SQL Upload error last comment

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-12-11 12:11:14 +00:00
parent 14bef345d1
commit ae50054466
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
read_dump.php3
View File

@@ -101,13 +101,15 @@ function PMA_splitSqlFile(&$ret, $sql, $release)
: strpos(' ' . $sql, "\015", $i+2); : strpos(' ' . $sql, "\015", $i+2);
if (!$end_of_comment) { if (!$end_of_comment) {
// no eol found after '#', add the parsed part to the returned // no eol found after '#', add the parsed part to the returned
// array and exit // array if required and exit
$ret[] = trim(substr($sql, 0, $i-1)); if ($start_of_comment > 0) {
$ret[] = trim(substr($sql, 0, $start_of_comment));
}
return TRUE; return TRUE;
} else { } else {
$sql = substr($sql, 0, $start_of_comment) $sql = substr($sql, 0, $start_of_comment)
. ltrim(substr($sql, $end_of_comment)); . ltrim(substr($sql, $end_of_comment));
$sql_len = strlen($sql); $sql_len = strlen($sql);
$i--; $i--;
} // end if...else } // end if...else
} // end else if (is comment) } // end else if (is comment)
@@ -356,7 +358,7 @@ if (!empty($id_bookmark) && $action_bookmark == 2) {
} else if (!isset($sql_query_cpy)) { } else if (!isset($sql_query_cpy)) {
$message = $strNoQuery; $message = $strNoQuery;
} else if ($sql_query_cpy == '') { } else if ($sql_query_cpy == '') {
$message = "$strSuccess&nbsp:<br />$strTheContent ($pieces_count $strInstructions)&nbsp;"; $message = "$strSuccess&nbsp;:<br />$strTheContent ($pieces_count $strInstructions)&nbsp;";
} else { } else {
$message = $strSuccess; $message = $strSuccess;
} }