Delete temporary file before reporting error

Signed-off-by: Michal Čihař <michal@cihar.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/libraries/plugins/import/ImportShp.class.php b/libraries/plugins/import/ImportShp.class.php
index 6fa9ac9c28..c5b3cc2124 100644
--- a/libraries/plugins/import/ImportShp.class.php
+++ b/libraries/plugins/import/ImportShp.class.php
@@ -148,6 +148,14 @@ class ImportShp extends ImportPlugin
             }
         }
 
+        // Delete the .dbf file extracted to 'TempDir'
+        if ($temp_dbf_file
+            && isset($dbf_file_path)
+            && file_exists($dbf_file_path)
+        ) {
+            unlink($dbf_file_path);
+        }
+
         // Load data
         $shp->loadFromFile('');
         if ($shp->lastError != "") {
@@ -159,14 +167,6 @@ class ImportShp extends ImportPlugin
             return;
         }
 
-        // Delete the .dbf file extracted to 'TempDir'
-        if ($temp_dbf_file
-            && isset($dbf_file_path)
-            && file_exists($dbf_file_path)
-        ) {
-            unlink($dbf_file_path);
-        }
-
         $esri_types = array(
             0  => 'Null Shape',
             1  => 'Point',
@@ -340,4 +340,4 @@ class ImportShp extends ImportPlugin
         $buffer = substr($buffer, $length);
         return $result;
     }
-}
\ No newline at end of file
+}