From a34c450953a69de0a54a0b1327ba9bb7f7bb6758 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Sat, 3 Oct 2009 06:36:13 +0000
Subject: [PATCH] Fix: bug during backup import model

---
 htdocs/imports/import.class.php | 2 +-
 htdocs/imports/import.php       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/imports/import.class.php b/htdocs/imports/import.class.php
index 2337c44dcd5..28752193ddd 100644
--- a/htdocs/imports/import.class.php
+++ b/htdocs/imports/import.class.php
@@ -215,7 +215,7 @@ class Import
 
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'import_model (';
 		$sql.= 'label, type, field)';
-		$sql.= " VALUES ('".$this->model_name."', '".$this->datatoimport."', '".$this->hexa."')";
+		$sql.= " VALUES ('".addslashes($this->model_name)."', '".$this->datatoimport."', '".$this->hexa."')";
 
 		dol_syslog("Import::create sql=".$sql, LOG_DEBUG);
 		$resql=$this->db->query($sql);
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 767258e62a7..3fd2ce94edb 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -968,6 +968,7 @@ if ($step == 4 && $datatoimport)
 		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		print '<input type="hidden" name="action" value="add_import_model">';
 		print '<input type="hidden" name="step" value="'.$step.'">';
+		print '<input type="hidden" name="format" value="'.$format.'">';
 		print '<input type="hidden" name="datatoimport" value="'.$datatoimport.'">';
     	print '<input type="hidden" name="filetoimport" value="'.$filetoimport.'">';
 		print '<input type="hidden" name="hexa" value="'.$hexa.'">';