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

bug #3038193 [display] Error when editing row with GEOMETRY column

Browse Source
This commit is contained in:
Marc Delisle
2010-10-03 09:34:08 -04:00
parent 1623c7e065
commit 1c49cd3d64
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -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 [core] copy procedures and routines before tables
- bug #3062455 [export] with SQL, export procedures and routines before tables - bug #3062455 [export] with SQL, export procedures and routines before tables
- bug #3056023 [import] USE query not working - bug #3056023 [import] USE query not working
- bug #3038193 [display] Error when editing row with GEOMETRY column
3.3.7.0 (2010-09-07) 3.3.7.0 (2010-09-07)
- patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after - patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after

6
tbl_change.php
View File

@@ -497,7 +497,7 @@ foreach ($rows as $row_id => $vrow) {
if (($cfg['ProtectBinary'] && $field['is_blob'] && !$is_upload) if (($cfg['ProtectBinary'] && $field['is_blob'] && !$is_upload)
|| ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) { || ($cfg['ProtectBinary'] == 'all' && $field['is_binary'])) {
echo ' <td align="center">' . $strBinary . '</td>' . "\n"; echo ' <td align="center">' . $strBinary . '</td>' . "\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 ' <td align="center">--</td>' . "\n"; echo ' <td align="center">--</td>' . "\n";
} else { } else {
?> ?>
@@ -1027,6 +1027,10 @@ foreach ($rows as $row_id => $vrow) {
} }
} // end if (web-server upload directory) } // end if (web-server upload directory)
} // end elseif (binary or blob) } // end elseif (binary or blob)
elseif ('geometry' == $field['pma_type']) {
// ignore this column to avoid changing it
}
else { else {
// field size should be at least 4 and max 40 // field size should be at least 4 and max 40
$fieldsize = min(max($field['len'], 4), 40); $fieldsize = min(max($field['len'], 4), 40);