From 36652ff231ea8c91750fe0548e1dc9f7df11876e Mon Sep 17 00:00:00 2001 From: Matthew Vale Date: Fri, 4 Dec 2015 12:24:22 +0000 Subject: [PATCH 1/2] use DOCUMENT_ROOT rather than assume path --- core/upgrade/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/upgrade/index.php b/core/upgrade/index.php index d51b012718..376c7b54d8 100644 --- a/core/upgrade/index.php +++ b/core/upgrade/index.php @@ -53,7 +53,7 @@ if (sizeof($_POST) > 0) { // run source update if ($do["source"] && permission_exists("upgrade_source") && !is_dir("/usr/share/examples/fusionpbx")) { - chdir("/var/www/fusionpbx/"); + chdir($_SERVER["DOCUMENT_ROOT"]); exec("git pull", $response_source_update); $update_failed = true; if (sizeof($response_source_update) > 0) { From 5c8aa45d449cd954021f4d1ee107f1ecd1d06952 Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Fri, 4 Dec 2015 16:18:53 +0300 Subject: [PATCH 2/2] Fix. send_mail without file. --- resources/install/scripts/resources/functions/send_mail.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/install/scripts/resources/functions/send_mail.lua b/resources/install/scripts/resources/functions/send_mail.lua index 52f8e647e4..430983ed2e 100644 --- a/resources/install/scripts/resources/functions/send_mail.lua +++ b/resources/install/scripts/resources/functions/send_mail.lua @@ -90,7 +90,7 @@ if freeswitch then if file then freeswitch.email(address, address, mail_headers, body, file) else - freeswitch.email(address, address, mail_headers, body, file) + freeswitch.email(address, address, mail_headers, body) end end end