From 12246a1c9768abbb852713c0385b5dcb083e4af7 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Wed, 25 Aug 2010 12:25:36 +0200
Subject: [PATCH] Merge c93cb8071ead39bfbfd0d2215c928eba5f4b3ee1 and
 e649acf414796c7b4dbd3b2e79b1169c9f1603f9 from Kronolith.

---
 mnemo/data.php | 3 ++-
 nag/data.php   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mnemo/data.php b/mnemo/data.php
index 7fa7fcb21..28df7b34a 100644
--- 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 729e1f1a6..08469d79b 100644
--- 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);
-- 
2.11.0