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

bug 1221602, undefined variable when trying to use a reserved word as an identifier

Browse Source
This commit is contained in:
Marc Delisle
2005-06-18 11:07:05 +00:00
parent a6c4d3e1d6
commit 34d03eac93
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2005-06-18 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.lib.php: bug 1221602, undefined variable when trying
to use a reserved word as an identifier
2005-06-12 Marc Delisle <lem9@users.sourceforge.net> 2005-06-12 Marc Delisle <lem9@users.sourceforge.net>
* tbl_properties.inc.php: visually bind the Add x fields dialog to its * tbl_properties.inc.php: visually bind the Add x fields dialog to its
submit button submit button

4
libraries/sqlparser.lib.php
View File

@@ -1681,7 +1681,6 @@ if ($is_minimum_common == FALSE) {
} }
} }
if (($arr[$i]['type'] == 'alpha_columnAttrib')) { if (($arr[$i]['type'] == 'alpha_columnAttrib')) {
$upper_data = strtoupper($arr[$i]['data']); $upper_data = strtoupper($arr[$i]['data']);
if ($seen_create_table && $in_create_table_fields) { if ($seen_create_table && $in_create_table_fields) {
@@ -1691,10 +1690,9 @@ if ($is_minimum_common == FALSE) {
} }
} }
if (($arr[$i]['type'] == 'alpha_columnType')) { if (($arr[$i]['type'] == 'alpha_columnType')) {
$upper_data = strtoupper($arr[$i]['data']); $upper_data = strtoupper($arr[$i]['data']);
if ($seen_create_table && $in_create_table_fields) { if ($seen_create_table && $in_create_table_fields && isset($current_identifier)) {
$create_table_fields[$current_identifier]['type'] = $upper_data; $create_table_fields[$current_identifier]['type'] = $upper_data;
if ($upper_data == 'TIMESTAMP') { if ($upper_data == 'TIMESTAMP') {
$in_timestamp_options = TRUE; $in_timestamp_options = TRUE;