- Invalid value written to DB on "null" Fixes #3862

Author: Marius Burkard

interface/lib/classes/tform_base.inc.php

@@ -831,7 +831,7 @@ protected function _encode($record, $tab, $dbencode = true, $api = false) {
 				}
 
 				//* Add slashes to all records, when we encode data which shall be inserted into mysql.
-				if($dbencode == true) $new_record[$key] = $app->db->quote($new_record[$key]);
+				if($dbencode == true && !is_null($new_record[$key])) $new_record[$key] = $app->db->quote($new_record[$key]);
 			}
 		}
 		return $new_record;
@@ -1244,7 +1244,7 @@ protected function _getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $
 							}
 						} else {
 							$sql_insert_key .= "`$key`, ";
-							$sql_insert_val .= "'".$record[$key]."', ";
+							$sql_insert_val .= (is_null($record[$key]) ? 'NULL' : "'".$record[$key]."'") . ", ";
 						}
 					} else {
 						if($field['formtype'] == 'PASSWORD') {
@@ -1271,7 +1271,7 @@ protected function _getSQL($record, $tab, $action = 'INSERT', $primary_id = 0, $
 								$sql_update .= "`$key` = '".$record[$key]."', ";
 							}
 						} else {
-							$sql_update .= "`$key` = '".$record[$key]."', ";
+							$sql_update .= "`$key` = " . (is_null($record[$key]) ? 'NULL' : "'".$record[$key]."'") . ", ";
 						}
 					}
 				} else {

interface/web/sites/form/ftp_user.tform.php

@@ -296,8 +296,7 @@
 
 $form['tabs']['advanced']['fields']['expires'] = array(
 	'datatype' => 'DATETIME',
-	'formtype' => 'DATETIME',
-	'default' => null
+	'formtype' => 'DATETIME'
 );