Merge remote-tracking branch 'remotes/origin/MAGETWO-52615-Backup' into MAGETWO-53121-502-Bad-Gateway

Hayder Sharhan · Hayder Sharhan · commit 86e550b64180 · 2016-06-14T23:32:19.000-05:00
diff --git a/app/code/Magento/Backup/Model/Fs/Collection.php b/app/code/Magento/Backup/Model/Fs/Collection.php
@@ -110,7 +110,10 @@ protected function _generateRow($filename)
             $row[$key] = $value;
         }
         $row['size'] = $this->_varDirectory->stat($this->_varDirectory->getRelativePath($filename))['size'];
-        $row['id'] = $row['time'] . '_' . $row['type'];
+        if (isset($row['display_name']) && $row['display_name'] == '') {
+            $row['display_name'] = 'WebSetupWizard';
+        }
+        $row['id'] = $row['time'] . '_' . $row['type'] . (isset($row['display_name']) ? $row['display_name'] : '');
         return $row;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,10 @@ protected function _generateRow($filename)`
`110`	`110`	`$row[$key] = $value;`
`111`	`111`	`}`
`112`	`112`	`$row['size'] = $this->_varDirectory->stat($this->_varDirectory->getRelativePath($filename))['size'];`
`113`		`- $row['id'] = $row['time'] . '_' . $row['type'];`
	`113`	`+ if (isset($row['display_name']) && $row['display_name'] == '') {`
	`114`	`+ $row['display_name'] = 'WebSetupWizard';`
	`115`	`+ }`
	`116`	`+ $row['id'] = $row['time'] . '_' . $row['type'] . (isset($row['display_name']) ? $row['display_name'] : '');`
`114`	`117`	`return $row;`
`115`	`118`	`}`
`116`	`119`	`}`