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 18:26:38 +01:00
commit efa732548b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tbl_structure.php
View File

@ -45,19 +45,22 @@ if (isset($_REQUEST['reserved_word_check'])) {
$response = PMA_Response::getInstance();
if ($GLOBALS['cfg']['ReservedWordDisableWarning'] === false) {
$columns_names = $_REQUEST['field_name'];
$cols = "";
$reserved_keywords_columns = array();
foreach ($columns_names as $column) {
if (PMA_SQP_isKeyWord($column)) {
$cols .= $column . ", ";
$reserved_keywords_columns[] = $column;
}
}
if ($cols == "") {
if (count($reserved_keywords_columns) == 0) {
$response->isSuccess(false);
}
$response->addJSON(
'message', sprintf(
__('The column name(s) \'%s\' are MySQL reserved keyword.'),
trim($cols, ", ")
_ngettext(
'The column name \'%s\' is a MySQL reserved keyword.',
'The column names \'%s\' are MySQL reserved keywords.',
count($reserved_keywords_columns)),
implode(',', $reserved_keywords_columns)
)
);
} else {