Popravek uvoza arhivske ankete, ce se baza ne ujema

This commit is contained in:
pero1203 2021-10-08 10:47:33 +02:00
parent 3b3bcb222c
commit ab8aed55f9

View File

@ -1173,15 +1173,14 @@ class SurveyCopy {
*/ */
// ce polje v src datoteki ni nastavljeno ga damo na praznega // ce polje v src datoteki ni nastavljeno ga damo na praznega
if ( ! isset($row_src[$dest_field]) && ! isset($pre_set[$dest_field]) ) { if ( !isset($row_src[$dest_field]) && !isset($pre_set[$dest_field]) ) {
$dest_value = "''"; $dest_value = "''";
}
// ce je polje NULL, ga moramo rocno nastavit na NULL // ce je polje NULL, ga moramo rocno nastavit na NULL
} elseif ($row_src[$dest_field] === NULL) { elseif ( $row_src[$dest_field] === NULL && !isset($pre_set[$dest_field]) ) {
$dest_value = "NULL"; $dest_value = "NULL";
}
} else { else {
$dest_value = isset($pre_set[$dest_field]) $dest_value = isset($pre_set[$dest_field])
? ( !(is_array($pre_set[$dest_field]) && isset($pre_set[$dest_field]['field']) && isset($pre_set[$dest_field]['from'])) ? ( !(is_array($pre_set[$dest_field]) && isset($pre_set[$dest_field]['field']) && isset($pre_set[$dest_field]['from']))
? $pre_set[$dest_field] ? $pre_set[$dest_field]
@ -1191,7 +1190,6 @@ class SurveyCopy {
) )
) )
: "'".mysqli_real_escape_string($GLOBALS['connect_db'], $row_src[$dest_field])."'"; : "'".mysqli_real_escape_string($GLOBALS['connect_db'], $row_src[$dest_field])."'";
} }
$insert_values .= $insert_values_prefix . $dest_value; $insert_values .= $insert_values_prefix . $dest_value;