From f5fa0332078b9f17c1ac33f0c77335aab2147589 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Thu, 9 May 2013 17:37:23 -0400
Subject: [PATCH] better flow in dispatchMetadata function

---
 airtime_mvc/application/controllers/ApiController.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 8c767c0e0..c7fbae673 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -520,8 +520,6 @@ class ApiController extends Zend_Controller_Action
                 //File is not in database anymore.
                 if (is_null($file)) {
                     $return_hash['error'] = _("File does not exist in Airtime.");
-
-                    return $return_hash;
                 }
                 //Updating a metadata change.
                 else {
@@ -547,8 +545,6 @@ class ApiController extends Zend_Controller_Action
                     $return_hash['error'] = _("File doesn't exist in Airtime.");
                     Logging::warn("Attempt to delete file that doesn't exist.
                         Path: '$filepath'");
-
-                    return $return_hash;
                 } else {
                     $file->deleteByMediaMonitor();
                 }
@@ -561,11 +557,11 @@ class ApiController extends Zend_Controller_Action
                     $file->deleteByMediaMonitor();
                 }
                 $return_hash['success'] = 1;
-
-                return $return_hash;
             }
 
-            $return_hash['fileid'] = is_null($file) ? '-1' : $file->getId();
+            if (!isset($return_hash['error'])) {
+                $return_hash['fileid'] = is_null($file) ? '-1' : $file->getId();
+            }
             $con->commit();
         } catch (Exception $e) {
             Logging::warn("rolling back");