X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fdb%2Fmaintenance_db.inc;h=c40c4ef637aa77f58887b7d57924bab150c89b3e;hb=f15c44d373692556ffe23fe6461d26cb9fd5d2f6;hp=b2583d5c9b8f9f959ce24af20e7f0cd749029e9c;hpb=f00216978947d0fd076550f1969430265a270ce7;p=fa-stable.git

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index b2583d5c..c40c4ef6 100644
--- a/admin/db/maintenance_db.inc
+++ b/admin/db/maintenance_db.inc
@@ -110,6 +110,7 @@ function db_import($filename, $connection)
 	$drop_queries = array();
 	$table_queries = array();
 
+	ini_set("max_execution_time", "180");
 	// uncrompress gziped backup files
 	if (strpos($filename, ".gzip") || strpos($filename, ".GZIP"))
 		$lines = db_ungzip("lines", $filename);
@@ -313,7 +314,7 @@ function db_export($conn, $filename, $zip='no', $comment='')
     $out.="# Backup Date and Time: ".date("Y-m-d H:i")."\n";
     $out.="# Built by " . $app_title . " " . $version ."\n";
     $out.="# ".$power_url."\n";
-    $out.="# Company: ".$company."\n";
+    $out.="# Company: ". @html_entity_decode($company, ENT_COMPAT, $_SESSION['language']->encoding)."\n";
     $out.="# User: ".$_SESSION["wa_current_user"]->name."\n\n";
 
 	// write users comment
@@ -411,7 +412,7 @@ function db_export($conn, $filename, $zip='no', $comment='')
 					// run through each field
 					for ($k = 0; $k < $nf = db_num_fields($res2); $k++)
 					{
-						$out .= db_escape($row2[$k], true);
+						$out .= db_escape(@html_entity_decode($row2[$k], ENT_COMPAT, $_SESSION['language']->encoding));
 						if ($k < ($nf - 1))
 							$out .= ", ";
 					}