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

Merge branch 'master' into fax_queue

This commit is contained in:
Alexey Melnichuk 2015-12-04 22:06:06 +03:00
parent 34775e9f7a d8f8346314
commit 769658dd85
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/upgrade/index.php
View File

@ -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) {

2
resources/install/scripts/resources/functions/send_mail.lua
View File

@ -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