dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected incorrect merge

This commit is contained in:
Matthew Vale 2015-11-26 17:53:02 +00:00
parent e504c8b592
commit 5960b18e71
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/upgrade/app_defaults.php
View File

@ -34,10 +34,8 @@ if ($domains_processed == 1) {
}
//copy the files and directories from resources/install
$install = new install;
$install->domain_uuid = $domain_uuid;
$install->switch_scripts_dir = $_SESSION['switch']['scripts']['dir'];
$install->copy_scripts();
$obj = new install_switch;
$obj->upgrade();
}
//update the software table

6
core/upgrade/index.php
View File

@ -72,10 +72,8 @@ if (sizeof($_POST) > 0) {
//update scripts folder, if allowed (default)
if ($_SESSION['switch']['scripts']['dir'] != '') {
//copy the files and directories from resources/install
$install = new install;
$install->domain_uuid = $domain_uuid;
$install->switch_scripts_dir = $_SESSION['switch']['scripts']['dir'];
$install->copy_scripts();
$obj = new install_switch;
$obj->upgrade();
//set the message
$response_message = $text['message-upgrade_source_scripts'];
}