From: Automerge script <automerge@asterisk.org>
Date: Wed, 29 Mar 2006 20:06:56 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.7-netsec~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99a4cd1de2e38d55ec2c3453a5804c152f2627e8;p=thirdparty%2Fasterisk.git

automerge commit

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

diff --git a/apps/app_stack.c b/apps/app_stack.c
index e3c33d2e5c..fb24f27c4a 100644
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -139,7 +139,7 @@ static int gosubif_exec(struct ast_channel *chan, void *data)
 	label1 = strsep(&args, ":");
 	label2 = args;
 
-	if (ast_true(condition)) {
+	if (pbx_checkcondition(condition)) {
 		if (label1) {
 			res = gosub_exec(chan, label1);
 		}
diff --git a/include/asterisk/pbx.h b/include/asterisk/pbx.h
index d2902002c4..cd116321fd 100644
--- a/include/asterisk/pbx.h
+++ b/include/asterisk/pbx.h
@@ -569,6 +569,9 @@ int ast_pbx_outgoing_exten(const char *type, int format, void *data, int timeout
    particular application with given extension */
 int ast_pbx_outgoing_app(const char *type, int format, void *data, int timeout, const char *app, const char *appdata, int *reason, int sync, const char *cid_num, const char *cid_name, struct ast_variable *vars, const char *account, struct ast_channel **locked_channel);
 
+/* Evaluate a condition for non-falseness and return a boolean */
+int pbx_checkcondition(char *condition);
+
 /* Functions for returning values from structures */
 const char *ast_get_context_name(struct ast_context *con);
 const char *ast_get_extension_name(struct ast_exten *exten);
diff --git a/pbx.c b/pbx.c
index d1da3a498e..4546881c95 100644
--- a/pbx.c
+++ b/pbx.c
@@ -6107,7 +6107,7 @@ void pbx_builtin_clear_globals(void)
 	ast_mutex_unlock(&globalslock);
 }
 
-static int pbx_checkcondition(char *condition) 
+int pbx_checkcondition(char *condition) 
 {
 	if (condition) {
 		if (*condition == '\0') {