From: Nik Okuntseff Date: Tue, 18 Dec 2018 20:14:23 +0000 (+0000) Subject: Improved import. X-Git-Tag: timetracker_1.19-1~402 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=6fc6c28b9eed8a9316a630185e327a53bb0d9e0c;p=timetracker.git Improved import. --- diff --git a/WEB-INF/lib/ttOrgImportHelper.class.php b/WEB-INF/lib/ttOrgImportHelper.class.php index ff3376d3..626408f2 100644 --- a/WEB-INF/lib/ttOrgImportHelper.class.php +++ b/WEB-INF/lib/ttOrgImportHelper.class.php @@ -551,11 +551,11 @@ class ttOrgImportHelper { $this->firstPass = false; // We are done with 1st pass. xml_parser_free($parser); if ($file) fclose($file); - if (!$this->canImport) { + if ($this->errors->yes()) { + // Remove the file and exit if we have errors. unlink($filename); return; } - if ($this->errors->yes()) return; // Exit if we have errors. // Now we can do a second pass, where real work is done. $parser = xml_parser_create(); diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 38267b68..176d7142 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.18.32.4662 | Copyright © Anuko | +  Anuko Time Tracker 1.18.32.4663 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve}