Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/bareos/bareos-webui.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Bergkemper <frank.bergkemper@bareos.com>2018-01-26 15:09:40 +0300
committerFrank Bergkemper <frank.bergkemper@bareos.com>2018-01-26 15:09:40 +0300
commit71b0a510c4e81bdd96f7a637265683c2ab563a4d (patch)
tree708858ea8ce6afbcf67d86bf7bf33f040cda86f6
parent2c34a60d42978e408dab8c86057488dc6d386f6b (diff)
Fix: Avoid an incorrect and too early bail out
-rw-r--r--module/Restore/src/Restore/Model/RestoreModel.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/module/Restore/src/Restore/Model/RestoreModel.php b/module/Restore/src/Restore/Model/RestoreModel.php
index 054263e..a818c0e 100644
--- a/module/Restore/src/Restore/Model/RestoreModel.php
+++ b/module/Restore/src/Restore/Model/RestoreModel.php
@@ -56,11 +56,7 @@ class RestoreModel
$result = $bsock->send_command($cmd_1, 2, $jobid);
$directories = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);
- if ( empty($directories['result']) ) {
- return $retval;
- }
-
- if(empty($directories['result']['directories'])) {
+ if(empty($directories['result'])) {
$cmd_2 = '.bvfs_lsdirs jobid='.$jobid.' path=@ limit='.$limit;
$result = $bsock->send_command($cmd_2, 2, $jobid);
$directories = \Zend\Json\Json::decode($result, \Zend\Json\Json::TYPE_ARRAY);