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

Bug #856436

Browse Source
This commit is contained in:
Garvin Hicking
2003-12-09 10:29:25 +00:00
parent cad1c02326
commit a132e28770
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-12-08 Garvin Hicking <embatag@supergarv.de>
* tbl_change.php: Fixed Bug #856436 (not displaying default values)
2003-12-08 Marc Delisle <lem9@users.sourceforge.net> 2003-12-08 Marc Delisle <lem9@users.sourceforge.net>
* new language: basque, thanks to Axier Lopez (axierl@euskalerria.org) * new language: basque, thanks to Axier Lopez (axierl@euskalerria.org)

14
tbl_change.php
View File

@@ -198,7 +198,7 @@ $fields_cnt = mysql_num_rows($table_def);
// Set a flag here because the 'if' would not be valid in the loop // Set a flag here because the 'if' would not be valid in the loop
// if we set a value in some field // if we set a value in some field
$insert_mode = (!isset($row) ? TRUE : FALSE); $insert_mode = (!isset($row) ? TRUE : FALSE);
$loop_array = (isset($row) ? $row : array(0 => array(0 => 0))); $loop_array = (isset($row) ? $row : array(0 => FALSE));
while ($trow = PMA_mysql_fetch_array($table_def)) { while ($trow = PMA_mysql_fetch_array($table_def)) {
$trow_table_def[] = $trow; $trow_table_def[] = $trow;
@@ -206,6 +206,10 @@ while ($trow = PMA_mysql_fetch_array($table_def)) {
$o_rows = 0; $o_rows = 0;
foreach($loop_array AS $vrowcount => $vrow) { foreach($loop_array AS $vrowcount => $vrow) {
if ($vrow === FALSE) {
unset($vrow);
}
$vresult = (isset($result) && is_array($result) && isset($result[$vrowcount]) ? $result[$vrowcount] : $result); $vresult = (isset($result) && is_array($result) && isset($result[$vrowcount]) ? $result[$vrowcount] : $result);
?> ?>
<table border="<?php echo $cfg['Border']; ?>"> <table border="<?php echo $cfg['Border']; ?>">
@@ -278,7 +282,11 @@ foreach($loop_array AS $vrowcount => $vrow) {
&& (!isset($row_table_def['Default']))) { && (!isset($row_table_def['Default']))) {
// INSERT case // INSERT case
if ($insert_mode) { if ($insert_mode) {
$vrow[$rowfield] = date('Y-m-d H:i:s', time()); if (isset($vrow)) {
$vrow[$rowfield] = date('Y-m-d H:i:s', time());
} else {
$vrow = array($rowfield => date('Y-m-d H:i:s', time()));
}
} }
// UPDATE case with an empty and not NULL value under PHP4 // UPDATE case with an empty and not NULL value under PHP4
else if (empty($vrow[$rowfield]) && is_null($vrow[$rowfield])) { else if (empty($vrow[$rowfield]) && is_null($vrow[$rowfield])) {
@@ -457,7 +465,7 @@ foreach($loop_array AS $vrowcount => $vrow) {
if (!(($cfg['ProtectBinary'] && $is_blob) || ($cfg['ProtectBinary'] == 'all' && $is_binary)) if (!(($cfg['ProtectBinary'] && $is_blob) || ($cfg['ProtectBinary'] == 'all' && $is_binary))
&& $row_table_def['Null'] == 'YES') { && $row_table_def['Null'] == 'YES') {
echo ' <input type="checkbox" tabindex="' . ((2 * $fields_cnt) + ($i * $m_rows) + 1) . '"' echo ' <input type="checkbox" tabindex="' . ((2 * $fields_cnt) + ($i * $m_rows) + 1) . '"'
. ' name="fields_null[' . urlencode($field) . ']"'; . ' name="fields_null' . $vkey . '[' . urlencode($field) . ']"';
//if ($data == 'NULL' && !$first_timestamp) { //if ($data == 'NULL' && !$first_timestamp) {
if ($real_null_value && !$first_timestamp) { if ($real_null_value && !$first_timestamp) {
echo ' checked="checked"'; echo ' checked="checked"';