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

Set correct return value (bug #1048861).

Browse Source
This commit is contained in:
Michal Čihař
2004-10-19 12:49:21 +00:00
parent fcdfa25a14
commit f3b5c67cbd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -7,6 +7,7 @@ $Source$
2004-10-19 Michal Čihař <michal@cihar.com> 2004-10-19 Michal Čihař <michal@cihar.com>
* export.php: Use just \n for SQL exports (bug #1042521). * export.php: Use just \n for SQL exports (bug #1042521).
* libraries/read_dump.lib.php: Set correct return value (bug #1048861).
2004-10-17 Marc Delisle <lem9@users.sourceforge.net> 2004-10-17 Marc Delisle <lem9@users.sourceforge.net>
* lang/turkish update, thanks to boralioglu. * lang/turkish update, thanks to boralioglu.

4
libraries/read_dump.lib.php
View File

@@ -39,7 +39,7 @@ function PMA_splitSqlFile(&$ret, $sql, $release)
// No end of string found -> add the current substring to the // No end of string found -> add the current substring to the
// returned array // returned array
if (!$i) { if (!$i) {
$ret[] = $sql; $ret[] = array('query' => $sql, 'empty' => $nothing);
return TRUE; return TRUE;
} }
// Backquotes or no backslashes before quotes: it's indeed the // Backquotes or no backslashes before quotes: it's indeed the
@@ -72,7 +72,7 @@ function PMA_splitSqlFile(&$ret, $sql, $release)
} // end if...elseif...else } // end if...elseif...else
} // end for } // end for
} // end if (in string) } // end if (in string)
// lets skip comments (/*, -- and #) // lets skip comments (/*, -- and #)
else if (($char == '-' && $sql_len > $i + 2 && $sql[$i + 1] == '-' && $sql[$i + 2] <= ' ') || $char == '#' || ($char == '/' && $sql_len > $i + 1 && $sql[$i + 1] == '*')) { else if (($char == '-' && $sql_len > $i + 2 && $sql[$i + 1] == '-' && $sql[$i + 2] <= ' ') || $char == '#' || ($char == '/' && $sql_len > $i + 1 && $sql[$i + 1] == '*')) {
$i = strpos($sql, $char == '/' ? '*/' : "\n", $i); $i = strpos($sql, $char == '/' ? '*/' : "\n", $i);