Merged bugfixes upto [0000072] (version 2.0.3).

[fa-stable.git] / admin / db / maintenance_db.inc

diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc
index 444ac100d2f3cc72b0f32f2827dab98578e9742f..c40c4ef637aa77f58887b7d57924bab150c89b3e 100644 (file)
--- 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]);
+                                               $out .= db_escape(@html_entity_decode($row2[$k], ENT_COMPAT, $_SESSION['language']->encoding));
                                                if ($k < ($nf - 1))
                                                        $out .= ", ";
                                        }