Skip to content

Commit 0fd1cec

Browse files
author
Marius Burkard
committed
- return instance id on APS install through API, fixes #4933
- fixed backups not downloadable on multiserver slave, fixes #4973
1 parent 616db81 commit 0fd1cec

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

interface/lib/classes/aps_guicontroller.inc.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -417,6 +417,8 @@ public function createPackageInstance($settings, $packageid)
417417

418418
//* Set package status to install afetr we inserted the settings
419419
$app->db->datalogUpdate('aps_instances', array("instance_status" => INSTANCE_INSTALL), 'id', $InstanceID);
420+
421+
return $InstanceID;
420422
}
421423

422424
/**

server/plugins-available/backup_plugin.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function backup_action($action_name, $data) {
7070

7171
$app->uses('ini_parser,file,getconf,system');
7272

73-
$web = $app->dbmaster->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $backup['parent_domain_id']);
73+
$web = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $backup['parent_domain_id']);
7474
$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
7575
$backup_dir = trim($server_config['backup_dir']);
7676
if($backup_dir == '') return;

0 commit comments

Comments
 (0)