From 67485283ea97706352bea8a26616173294b209e2 Mon Sep 17 00:00:00 2001 From: AkarshMR Date: Mon, 16 Dec 2024 06:15:31 +0000 Subject: [PATCH 1/2] Bugfix #582 Return ${GOSUB_RETVAL} value where ever macroexit is called --- amp_conf/htdocs/admin/libraries/extensions.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp_conf/htdocs/admin/libraries/extensions.class.php b/amp_conf/htdocs/admin/libraries/extensions.class.php index ae9923e311..e98440af50 100644 --- a/amp_conf/htdocs/admin/libraries/extensions.class.php +++ b/amp_conf/htdocs/admin/libraries/extensions.class.php @@ -1118,7 +1118,7 @@ function output() { //$callers=debug_backtrace(); //freepbx_log(FPBX_LOG_UPDATE, "Need to remove Macro from ".$callers[1]['file']." on line ".$callers[1]['line']); // macro deprecated , change macroexit to Return - return "Return()"; + return "Return(${GOSUB_RETVAL})"; } } From da21967ce95206ae989fa92e1623363568bf77d3 Mon Sep 17 00:00:00 2001 From: AkarshMR Date: Mon, 16 Dec 2024 06:35:38 +0000 Subject: [PATCH 2/2] double quotes to single quotes --- amp_conf/htdocs/admin/libraries/extensions.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amp_conf/htdocs/admin/libraries/extensions.class.php b/amp_conf/htdocs/admin/libraries/extensions.class.php index e98440af50..b95bc0cf96 100644 --- a/amp_conf/htdocs/admin/libraries/extensions.class.php +++ b/amp_conf/htdocs/admin/libraries/extensions.class.php @@ -1118,7 +1118,7 @@ function output() { //$callers=debug_backtrace(); //freepbx_log(FPBX_LOG_UPDATE, "Need to remove Macro from ".$callers[1]['file']." on line ".$callers[1]['line']); // macro deprecated , change macroexit to Return - return "Return(${GOSUB_RETVAL})"; + return 'Return(${GOSUB_RETVAL})'; } }