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

bug #1451426, edit breaks protected BLOB field, changes it from NULL to empty string

Browse Source
This commit is contained in:
Marc Delisle
2006-05-26 17:46:23 +00:00
parent b70a1f8820
commit bc42d746b4
2 changed files with 34 additions and 25 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$
2006-05-26 Marc Delisle <lem9@users.sourceforge.net>
* tbl_change.php: bug #1451426, edit breaks protected BLOB field,
changes it from NULL to empty string
2006-05-23 Marc Delisle <lem9@users.sourceforge.net> 2006-05-23 Marc Delisle <lem9@users.sourceforge.net>
* tbl_change.php, tbl_replace.php: bug #1438999, updating a multi-table * tbl_change.php, tbl_replace.php: bug #1438999, updating a multi-table
view view

15
tbl_change.php
View File

@@ -565,19 +565,19 @@ foreach ($loop_array AS $vrowcount => $vrow) {
} }
} // end if ($cfg['ShowFunctionFields']) } // end if ($cfg['ShowFunctionFields'])
// The null column // The null column
// --------------- // ---------------
echo ' <td>' . "\n"; echo ' <td>' . "\n";
if (!(($cfg['ProtectBinary'] && $is_blob) || ($cfg['ProtectBinary'] == 'all' && $is_binary)) if ($row_table_def['Null'] == 'YES') {
&& $row_table_def['Null'] == 'YES') {
echo ' <input type="hidden" name="fields_null_prev' . $vkey . '[' . urlencode($field) . ']"'; echo ' <input type="hidden" name="fields_null_prev' . $vkey . '[' . urlencode($field) . ']"';
if ($real_null_value && !$first_timestamp) { if ($real_null_value && !$first_timestamp) {
//echo ' checked="checked"';
echo ' value="on"'; echo ' value="on"';
} }
echo ' />' . "\n"; echo ' />' . "\n";
if (!(($cfg['ProtectBinary'] && $is_blob) || ($cfg['ProtectBinary'] == 'all' && $is_binary)) ) {
echo ' <input type="checkbox" tabindex="' . ($tabindex + $tabindex_for_null) . '"' echo ' <input type="checkbox" tabindex="' . ($tabindex + $tabindex_for_null) . '"'
. ' name="fields_null' . $vkey . '[' . urlencode($field) . ']"'; . ' name="fields_null' . $vkey . '[' . urlencode($field) . ']"';
if ($real_null_value && !$first_timestamp) { if ($real_null_value && !$first_timestamp) {
@@ -601,7 +601,12 @@ foreach ($loop_array AS $vrowcount => $vrow) {
$onclick .= '\'' . urlencode($field) . '\', \'' . md5($field) . '\', \'' . $vkey . '\'); this.checked = true}; return true" />' . "\n"; $onclick .= '\'' . urlencode($field) . '\', \'' . md5($field) . '\', \'' . $vkey . '\'); this.checked = true}; return true" />' . "\n";
echo $onclick; echo $onclick;
} else { } else {
echo ' &nbsp;' . "\n"; echo ' <input type="hidden" name="fields_null' . $vkey . '[' . urlencode($field) . ']"';
if ($real_null_value && !$first_timestamp) {
echo ' value="on"';
}
echo ' />' . "\n";
}
} }
echo ' </td>' . "\n"; echo ' </td>' . "\n";