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

Merge branch 'QA_4_4'

Browse Source
This commit is contained in:
Marc Delisle 2015-08-08 12:17:08 -04:00
commit 23aecf5123
2 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -90,6 +90,9 @@ phpMyAdmin - ChangeLog
4.4.14.0 (not yet released)
4.4.13.1 (2015-08-08)
- issue #11368 SQL error when importing phpMyAdmin dump file
4.4.13.0 (2015-08-07)
- issue #1808 "Improve table structure" generates invalid SQL
- issue Once checked "Show only active" checkbox is always checked

20
libraries/plugins/import/ImportSql.class.php
View File

@ -253,7 +253,6 @@ class ImportSql extends ImportPlugin
{
$this->_firstSearchChar = null;
$firstSqlDelimiter = null;
$commentStartPosition = null;
$matches = null;
/* while not at end of line */
@ -273,14 +272,6 @@ class ImportSql extends ImportPlugin
"\n",
$this->_delimiterPosition
);
//Set _queryBeginPosition if comment is at the beginning of the query
if ($commentStartPosition === 0) {
if (false === $posClosingComment) {
$this->_queryBeginPosition = $this->_stringFctToUse['strlen']($this->_data);
} else {
$this->_queryBeginPosition = $posClosingComment + 1;
}
}
if (false === $posClosingComment) {
return false;
}
@ -288,7 +279,6 @@ class ImportSql extends ImportPlugin
$this->_delimiterPosition = $posClosingComment + 1;
$this->_isInComment = false;
$this->_openingComment = null;
$commentStartPosition = null;
} elseif ('/*' === $this->_openingComment) {
//Search for closing comment
$posClosingComment = $this->_stringFctToUse['strpos'](
@ -296,14 +286,6 @@ class ImportSql extends ImportPlugin
'*/',
$this->_delimiterPosition
);
//Set _queryBeginPosition if comment is at the beginning of the query
if ($commentStartPosition === 0) {
if (false === $posClosingComment) {
$this->_queryBeginPosition = $this->_stringFctToUse['strlen']($this->_data);
} else {
$this->_queryBeginPosition = $posClosingComment + 2;
}
}
if (false === $posClosingComment) {
return false;
}
@ -311,7 +293,6 @@ class ImportSql extends ImportPlugin
$this->_delimiterPosition = $posClosingComment + 2;
$this->_isInComment = false;
$this->_openingComment = null;
$commentStartPosition = null;
} else {
//We shouldn't be able to come here.
//throw new Exception('Unknown case.');
@ -380,7 +361,6 @@ class ImportSql extends ImportPlugin
if (in_array($specialChars, array('#', '-- ', '/*'))) {
$this->_isInComment = true;
$this->_openingComment = $specialChars;
$commentStartPosition = $this->_firstSearchChar;
//Move before comment opening.
$this->_delimiterPosition = $this->_firstSearchChar
+ $this->_stringFctToUse['strlen']($specialChars);