[asterisk-commits] qwell: branch 1.8 r282131 - in /branches/1.8: ./ pbx/pbx_config.c

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu Aug 12 17:51:44 2010
New Revision: 282131

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=282131
Log:
Merged revisions 282130 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r282130 | qwell | 2010-08-12 17:50:54 -0500 (Thu, 12 Aug 2010) | 9 lines
  
  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.
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/pbx/pbx_config.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
--- branch-1.6.2-merged (original)
+++ branch-1.6.2-merged Thu Aug 12 17:51:44 2010
@@ -1,1 +1,1 @@
-/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551,280671,280739,280983,281051,281391,281430,281567,281574,281722,281763,281873,281912
+/branches/1.6.2:1-279056,279207,279501,279561,279597,279609,279657,279784,279849,279946,280089,280160,280193,280229,280231,280306,280345,280449,280551,280671,280739,280983,281051,281391,281430,281567,281574,281722,281763,281873,281912,282130

Modified: branches/1.8/pbx/pbx_config.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/pbx/pbx_config.c?view=diff&rev=282131&r1=282130&r2=282131
==============================================================================
--- branches/1.8/pbx/pbx_config.c (original)
+++ branches/1.8/pbx/pbx_config.c Thu Aug 12 17:51:44 2010
@@ -1737,12 +1737,12 @@
 
 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;
 }