Merge branch 'bareos-15.2'

bareos · Feb 26, 2016 · 1ab5cb2 · 1ab5cb2
2 parents 40e66ba + 0bca9e8
commit 1ab5cb2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/module/Dashboard/view/dashboard/dashboard/index.phtml b/module/Dashboard/view/dashboard/dashboard/index.phtml
@@ -77,13 +77,6 @@ $this->headTitle($title);
 
 </div>
 
-<div class="col-md-4">
-<div class="alert alert-dismissable alert-warning" role="alert">
-<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
-Heads up! You are now able to <a href="<?php echo $this->url('restore', array()); ?>" class="alert-link"><?php echo $this->translate("restore"); ?></a> your files via the webui.
-</div>
-</div>
-
 </div>
 
 <?php

diff --git a/vendor/Bareos/library/Bareos/BSock/BareosBSock.php b/vendor/Bareos/library/Bareos/BSock/BareosBSock.php
@@ -920,7 +920,7 @@ public function restore($type=null, $jobid=null, $client=null, $restoreclient=nu
          $debug = self::receive_message();
       }
 
-      if(self::send("restore file=?b2000$rnd client=$client restoreclient=$restoreclient restorejob=$restorejob where=$where replace=$replace yes")) {
+      if(self::send('restore file=?b2000'.$rnd.' client='.$client.' restoreclient='.$restoreclient.' restorejob="'.$restorejob.'" where='.$where.' replace='.$replace.' yes')) {
          $result = self::receive_message();
       }