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

Do not strip MySQL conditional statements in comments (patch #1459782, thanks to unconed - unconed).

Browse Source
This commit is contained in:
Michal Čihař
2006-04-27 10:05:04 +00:00
parent baac64a2e4
commit b60fcde9ad
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/import/sql.php
View File

@@ -144,7 +144,7 @@ if (isset($plugin_list)) {
) && !$finished) {
break;
}
// Comments
if ($ch == '#'
|| ($i < ($len - 1) && $ch == '-' && $buffer[$i + 1] == '-' && (($i < ($len - 2) && $buffer[$i + 2] <= ' ') || ($i == ($len - 1) && $finished)))
@@ -155,6 +155,7 @@ if (isset($plugin_list)) {
$sql .= substr($buffer, $start_pos, $i - $start_pos);
}
// Skip the rest
$j = $i;
$i = strpos($buffer, $ch == '/' ? '*/' : "\n", $i);
// didn't we hit end of string?
if ($i === FALSE) {
@@ -166,11 +167,22 @@ if (isset($plugin_list)) {
}
// Skip *
if ($ch == '/') {
// Check for MySQL conditional comments and include them as-is
if ($buffer[$j + 2] == '!') {
$comment = substr($buffer, $j + 3, $i - $j - 3);
if (preg_match('/^[0-9]{5}/', $comment, $version)) {
if ($version[0] <= PMA_MYSQL_INT_VERSION) {
$sql .= substr($comment, 5);
}
} else {
$sql .= $comment;
}
}
$i++;
}
// Skip last char
$i++;
// Next query part will start here
// Next query part will start here
$start_pos = $i;
// Aren't we at the end?
if ($i == $len) {