diff --git a/ChangeLog b/ChangeLog index a7c8d83eb..d6f020bb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #3062455 [core] copy procedures and routines before tables - bug #3062455 [export] with SQL, export procedures and routines before tables - bug #3056023 [import] USE query not working +- bug #3038193 [display] Error when editing row with GEOMETRY column 3.3.7.0 (2010-09-07) - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after diff --git a/tbl_change.php b/tbl_change.php index aa1a74f8d..f419bb158 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -497,7 +497,7 @@ foreach ($rows as $row_id => $vrow) { if (($cfg['ProtectBinary'] && $field['is_blob'] && !$is_upload) || ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) { echo ' ' . $strBinary . '' . "\n"; - } elseif (strstr($field['True_Type'], 'enum') || strstr($field['True_Type'], 'set')) { + } elseif (strstr($field['True_Type'], 'enum') || strstr($field['True_Type'], 'set') || 'geometry' == $field['pma_type']) { echo ' --' . "\n"; } else { ?> @@ -1027,6 +1027,10 @@ foreach ($rows as $row_id => $vrow) { } } // end if (web-server upload directory) } // end elseif (binary or blob) + + elseif ('geometry' == $field['pma_type']) { + // ignore this column to avoid changing it + } else { // field size should be at least 4 and max 40 $fieldsize = min(max($field['len'], 4), 40);