Merged revisions 282129 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r282129 | qwell | 2010-08-12 17:49:28 -0500 (Thu, 12 Aug 2010) | 1 line

  Register CLI commands before parsing config, in case there is a config error.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@282130 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index ae409edfddc7962fcda8d222e43f529ef87c9488..aeb69638dd5f7cee5e17bc1d93822351c93829d2 100644 (file)
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -1738,13 +1738,13 @@ static int pbx_load_module(void)
 
 static int load_module(void)
 {
-       if (pbx_load_module())
-               return AST_MODULE_LOAD_DECLINE;
- 
        if (static_config && !write_protect_config)
                ast_cli_register(&cli_dialplan_save);
        ast_cli_register_multiple(cli_pbx_config, ARRAY_LEN(cli_pbx_config));
 
+       if (pbx_load_module())
+               return AST_MODULE_LOAD_DECLINE;
+
        return AST_MODULE_LOAD_SUCCESS;
 }