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

revert bad fix (revision 10720)

Browse Source
This commit is contained in:
Marc Delisle
2007-10-08 20:52:25 +00:00
parent efa1b7f6aa
commit a915e18bd1
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -15,7 +15,6 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1764195 [views] DROP button does not work on defective views - bug #1764195 [views] DROP button does not work on defective views
- bug #1805773 [relations] browse foreign values: return values not escaped, - bug #1805773 [relations] browse foreign values: return values not escaped,
thanks to Alex Rambau thanks to Alex Rambau
- bug #1798786 [import] Wrong error message when a string contains semicolon
- bug #1807923 [login] Login with html entities in password fails - bug #1807923 [login] Login with html entities in password fails
- [core] Undefined variable when creating a table that exists - [core] Undefined variable when creating a table that exists

9
libraries/import/sql.php
View File

@@ -77,12 +77,6 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
$first_quote = strpos($buffer, '\'', $i); $first_quote = strpos($buffer, '\'', $i);
if ($first_quote === FALSE) { if ($first_quote === FALSE) {
$first_quote = $big_value; $first_quote = $big_value;
$next_quote = $big_value;
} else {
$next_quote = strpos($buffer, '\'', $first_quote + 1);
if ($next_quote === FALSE) {
$next_quote = $big_value;
}
} }
$p2 = strpos($buffer, '"', $i); $p2 = strpos($buffer, '"', $i);
if ($p2 === FALSE) { if ($p2 === FALSE) {
@@ -91,12 +85,11 @@ while (!($finished && $i >= $len) && !$error && !$timeout_passed) {
/** /**
* @todo it's a shortcoming to look for a delimiter that might be * @todo it's a shortcoming to look for a delimiter that might be
* inside quotes (or even double-quotes) * inside quotes (or even double-quotes)
* for the moment, catch the case of delimiter between quotes
*/ */
$first_sql_delimiter = strpos($buffer, $sql_delimiter, $i); $first_sql_delimiter = strpos($buffer, $sql_delimiter, $i);
if ($first_sql_delimiter === FALSE) { if ($first_sql_delimiter === FALSE) {
$first_sql_delimiter = $big_value; $first_sql_delimiter = $big_value;
} elseif ($first_sql_delimiter < $first_quote && $first_sql_delimiter > $next_quote) { } else {
$found_delimiter = true; $found_delimiter = true;
} }
$p4 = strpos($buffer, '#', $i); $p4 = strpos($buffer, '#', $i);