From 0fd1cec1171d6aab24cadd5147ae681ceac968df Mon Sep 17 00:00:00 2001 From: Marius Burkard Date: Fri, 2 Mar 2018 11:56:49 +0100 Subject: [PATCH] - return instance id on APS install through API, fixes #4933 - fixed backups not downloadable on multiserver slave, fixes #4973 --- interface/lib/classes/aps_guicontroller.inc.php | 2 ++ server/plugins-available/backup_plugin.inc.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/interface/lib/classes/aps_guicontroller.inc.php b/interface/lib/classes/aps_guicontroller.inc.php index 16dd9e82f1..80e011f4af 100644 --- a/interface/lib/classes/aps_guicontroller.inc.php +++ b/interface/lib/classes/aps_guicontroller.inc.php @@ -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; } /** diff --git a/server/plugins-available/backup_plugin.inc.php b/server/plugins-available/backup_plugin.inc.php index eda546dec6..5cb2dde423 100644 --- a/server/plugins-available/backup_plugin.inc.php +++ b/server/plugins-available/backup_plugin.inc.php @@ -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; -- GitLab