X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fmaintenance_db.inc;h=225d57f7827be4bc593e8494d3b9bb8fb1d90ef2;hb=9dab04be9d81766f1878d3688ee73d0bcf29f5d2;hp=8ddbaebc395c9446188bdca7c51648a34de22e51;hpb=0bf933423b9645bcb57390c478d4fdaf0c895049;p=fa-stable.git

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 8ddbaebc..225d57f7 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -617,11 +617,11 @@ function db_export($conn, $filename, $zip='no', $comment='', $tbpref = TB_PREF)
 				// check if field types are NULL or NOT NULL
 				$res3 = db_query("SHOW COLUMNS FROM `" . $tablename . "`");
 
-				$field_type = array();
+				$field_null = array();
 				for ($j = 0; $j < db_num_rows($res3); $j++)
 				{
 					$row3 = db_fetch($res3);
-					$field_type[] = $row3[2];
+					$field_null[] = $row3[2]=='YES' && $row3[4]===null;
 				}
 
 				$res2 = db_query("SELECT * FROM `" . $tablename . "`");
@@ -632,7 +632,7 @@ function db_export($conn, $filename, $zip='no', $comment='', $tbpref = TB_PREF)
 					// run through each field
 					for ($k = 0; $k < $nf = db_num_fields($res2); $k++)
 					{
-						$out .= db_escape(@html_entity_decode($row2[$k], ENT_QUOTES, $_SESSION['language']->encoding));
+						$out .= db_escape($row2[$k], $field_null[$k]);
 						if ($k < ($nf - 1))
 							$out .= ", ";
 					}