Commit 0fd1cec1 authored by Marius Burkard's avatar Marius Burkard

- return instance id on APS install through API, fixes #4933

- fixed backups not downloadable on multiserver slave, fixes #4973
parent 616db814
......@@ -417,6 +417,8 @@ class ApsGUIController extends ApsBase
//* Set package status to install afetr we inserted the settings
$app->db->datalogUpdate('aps_instances', array("instance_status" => INSTANCE_INSTALL), 'id', $InstanceID);
return $InstanceID;
}
/**
......
......@@ -70,7 +70,7 @@ class backup_plugin {
$app->uses('ini_parser,file,getconf,system');
$web = $app->dbmaster->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $backup['parent_domain_id']);
$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $backup['parent_domain_id']);
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
$backup_dir = trim($server_config['backup_dir']);
if($backup_dir == '') return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment