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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-01-09 08:25:38 +01:00
commit af92d319b3
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
+ rfe #1578 Warn about reserved word only when a column is created
+ rfe #1590 Recaptcha API v2
+ rfe #1580 Individual Zeroconf PMA tables support
+ rfe #1525 Generate keys one per line
4.3.7.0 (not yet released)
- bug #4694 js error on marking table as favorite in Safari (in private mode)

12
libraries/plugins/export/ExportSql.class.php
View File

@ -1340,15 +1340,13 @@ class ExportSql extends ExportPlugin
$sql_indexes_query_start = 'ALTER TABLE '
. PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
)
. $crlf . ' ';
);
$sql_indexes_query .= $sql_indexes_query_start;
$sql_indexes_start = 'ALTER TABLE '
. PMA_Util::backquoteCompat(
$table_alias, $compat, $sql_backquotes
)
. $crlf . ' ';
);
$sql_indexes .= $sql_indexes_start;
}
if ($update_indexes_increments && preg_match(
@ -1447,7 +1445,7 @@ class ExportSql extends ExportPlugin
if ($posConstraint === false) {
$tmp_str = preg_replace(
'/(FOREIGN[\s]+KEY)/',
'ADD \1',
' ADD \1',
$sql_lines[$j]
);
@ -1457,7 +1455,7 @@ class ExportSql extends ExportPlugin
} else {
$tmp_str = preg_replace(
'/(CONSTRAINT)/',
'ADD \1',
' ADD \1',
$sql_lines[$j]
);
@ -1490,7 +1488,7 @@ class ExportSql extends ExportPlugin
$sql_index_ended = false;
}
$tmp_str = " ADD " . $sql_lines[$j];
$tmp_str = $crlf . " ADD " . $sql_lines[$j];
$sql_indexes_query .= $tmp_str;
$sql_indexes .= $tmp_str;