Merge c93cb8071ead39bfbfd0d2215c928eba5f4b3ee1 and

e649acf414796c7b4dbd3b2e79b1169c9f1603f9 from Kronolith.

diff --git a/mnemo/data.php b/mnemo/data.php
index 7fa7fcb..28df7b3 100644 (file)
--- a/mnemo/data.php
+++ b/mnemo/data.php
@@ -93,7 +93,8 @@ case Horde_Data::IMPORT_FILE:
 }
 
 $next_step = null;
-if (!$error) {
+if (!$error && $import_format) {
+    $data = null;
     try {
         $data = $injector->getInstance('Horde_Data')->getData($import_format, array('cleanup' => '_cleanupData'));
         $next_step = $data->nextStep($actionID, $param);

diff --git a/nag/data.php b/nag/data.php
index 729e1f1..08469d7 100644 (file)
--- a/nag/data.php
+++ b/nag/data.php
@@ -137,7 +137,8 @@ case Horde_Data::IMPORT_FILE:
     break;
 }
 
-if (!$error) {
+if (!$error && $import_format) {
+    $data = null;
     try {
         $data = $injector->getInstance('Horde_Data')->getData($import_format, array('cleanup' => '_cleanupData'));
         $next_step = $data->nextStep($actionID, $param);