[svn-commits] eliel: branch group/appdocsxml r151720 - /team/group/appdocsxml/main/pbx.c

[SVN commits to the Digium repositories]

Author: eliel
Date: Thu Oct 23 07:02:52 2008
New Revision: 151720

URL: http://svn.digium.com/view/asterisk?view=rev&rev=151720
Log:
Inside the core don't use ast_config_load() use ast_config_load2() because
core can not reload.

Modified:
    team/group/appdocsxml/main/pbx.c

Modified: team/group/appdocsxml/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/main/pbx.c?view=diff&rev=151720&r1=151719&r2=151720
==============================================================================
--- team/group/appdocsxml/main/pbx.c (original)
+++ team/group/appdocsxml/main/pbx.c Thu Oct 23 07:02:52 2008
@@ -65,8 +65,6 @@
 #include "asterisk/indications.h"
 #include "asterisk/taskprocessor.h"
 #include "asterisk/xml.h"
-
-#define AST_MODULE "pbx"
 
 /*!
  * \note I M P O R T A N T :
@@ -6346,7 +6344,7 @@
 	/* setup default XML documentation language */
 	snprintf(documentation_language, sizeof(documentation_language), default_documentation_language);
 
-	if (!(cfg = ast_config_load("asterisk.conf", cnfflags))) {
+	if (!(cfg = ast_config_load2("asterisk.conf", "" /* core can't reload */, cnfflags))) {
 		ast_log(LOG_ERROR, "No asterisk.conf? That cannot be good.\n");
 	}