From 0bc6d6f8cb4e99ad6e5724a69f7b588b1efe2014 Mon Sep 17 00:00:00 2001
From: Filipe Fonseca <filipe.meirelesfonseca@luxairgroup.lu>
Date: Fri, 5 Feb 2016 14:43:00 +0100
Subject: [PATCH] Perform assignment after validating the return value

---
 includes/backend.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/backend.inc b/includes/backend.inc
index 7fd23ced4c..01c0193892 100644
--- a/includes/backend.inc
+++ b/includes/backend.inc
@@ -1034,8 +1034,8 @@ function _drush_backend_invoke($cmds, $common_backend_options = array(), $contex
 
       if ($proc['output']) {
         $values = drush_backend_parse_output($proc['output'], $proc['backend-options'], $proc['outputted']);
-        $values['site'] = $site;
         if (is_array($values)) {
+          $values['site'] = $site;
           if (empty($ret)) {
             $ret = $values;
           }