diff --git a/backup/backup_version.php b/backup/backup_version.php index 31b01064828..017831e8914 100644 --- a/backup/backup_version.php +++ b/backup/backup_version.php @@ -5,6 +5,6 @@ // database (backup_version) to determine whether upgrades should // be performed (see db/backup_*.php) -$backup_version = 2003070402; // The current version is a date (YYYYMMDDXX) +$backup_version = 2003070600; // The current version is a date (YYYYMMDDXX) -$backup_release = "0.8.0 alpha
Broken compatibility with previous backups !!"; // User-friendly version number +$backup_release = "0.8.1 alpha"; // User-friendly version number diff --git a/backup/backuplib.php b/backup/backuplib.php index 60c2bea626d..8250e7719d1 100644 --- a/backup/backuplib.php +++ b/backup/backuplib.php @@ -292,9 +292,9 @@ $st = start_tag($tag,$level,$endline); $co=""; if ($to_utf) { - $co = utf8_encode(htmlspecialchars($content)); + $co = preg_replace("/\r\n|\r/", "\n", utf8_encode(htmlspecialchars($content))); } else { - $co = htmlspecialchars($content); + $co = preg_replace("/\r\n|\r/", "\n", htmlspecialchars($content)); } $et = end_tag($tag,0,true); return $st.$co.$et;