[asterisk-commits] file: trunk r56860 - in /trunk: ./ pbx/pbx_config.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Feb 26 14:09:06 2007
New Revision: 56860

URL: http://svn.digium.com/view/asterisk?view=rev&rev=56860
Log:
Merged revisions 56856 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r56856 | file | 2007-02-26 15:07:18 -0500 (Mon, 26 Feb 2007) | 10 lines

Merged revisions 56850 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r56850 | file | 2007-02-26 15:05:02 -0500 (Mon, 26 Feb 2007) | 2 lines

Obey the clearglobalvars option in extensions reload (or dialplan reload depending on your version). (issue #9146 reported by ramonpeek)

........

................

Modified:
    trunk/   (props changed)
    trunk/pbx/pbx_config.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_config.c?view=diff&rev=56860&r1=56859&r2=56860
==============================================================================
--- trunk/pbx/pbx_config.c (original)
+++ trunk/pbx/pbx_config.c Mon Feb 26 14:09:06 2007
@@ -1272,6 +1272,8 @@
 {
 	if (argc != 2)
 		return RESULT_SHOWUSAGE;
+	if (clearglobalvars_config)
+		pbx_builtin_clear_globals();
 	pbx_load_module();
 	return RESULT_SUCCESS;
 }