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

Fixed two minor parser bugs.

Browse Source
This commit is contained in:
Alexander M. Turek
2002-10-30 15:49:45 +00:00
parent 93f7ebbd60
commit 1b52216bad
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -9,6 +9,10 @@ $Source$
2002-10-30 Alexander M. Turek <rabus@users.sourceforge.net>
* libraries/common.lib.php3: Better display of the query if parser is
disabled.
* libraries/sqlparser.lib.php3:
- ANSI Comments were not recognized if the two '-' characters were
followed up by a line feed character instead of a space one;
- Fixed the misinterpretation of Windows / Mac line feeds.
2002-10-28 Alexander M. Turek <rabus@users.sourceforge.net>
* lang/dutch.inc.php3: Fixed a bug in the Dutch language files

6
libraries/sqlparser.lib.php3
View File

@@ -171,6 +171,10 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
return $sql;
}
// rabus: Convert all line feeds to Unix style
$sql = str_replace("\r\n", "\n", $sql);
$sql = str_replace("\r", "\n", $sql);
$len = $GLOBALS['PMA_strlen']($sql);
if ($len == 0) {
return array();
@@ -227,7 +231,7 @@ if (!defined('PMA_SQP_LIB_INCLUDED')) {
// ANSI style --
if (($c == '#')
|| (($count2 + 1 < $len) && ($c == '/') && ($sql[$count2 + 1] == '*'))
|| (($count2 + 2 < $len) && ($c == '-') && ($sql[$count2 + 1] == '-') && ($sql[$count2 + 2] == ' '))) {
|| (($count2 + 2 < $len) && ($c == '-') && ($sql[$count2 + 1] == '-') && ereg("(\n|[space])", $sql[$count2 + 2]))) {
$count2++;
$pos = 0;
$type = 'bad';