[svn-commits] tilghman: branch 1.6.0 r120478 - in /branches/1.6.0: ./ main/pbx.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Wed Jun  4 15:35:38 2008
New Revision: 120478

URL: http://svn.digium.com/view/asterisk?view=rev&rev=120478
Log:
Merged revisions 120477 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r120477 | tilghman | 2008-06-04 15:34:52 -0500 (Wed, 04 Jun 2008) | 2 lines

MSet doesn't necessarily need chan to be set

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/pbx.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=120478&r1=120477&r2=120478
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Wed Jun  4 15:35:38 2008
@@ -7579,7 +7579,7 @@
 		AST_APP_ARG(value);
 	);
 
-	if (ast_strlen_zero(vdata) || !chan) {
+	if (ast_strlen_zero(vdata)) {
 		ast_log(LOG_WARNING, "MSet requires at least one variable name/value pair.\n");
 		return 0;
 	}
@@ -7593,6 +7593,8 @@
 			pbx_builtin_setvar_helper(chan, pair.name, pair.value);
 			if (strchr(pair.name, ' '))
 				ast_log(LOG_WARNING, "Please avoid unnecessary spaces on variables as it may lead to unexpected results ('%s' set to '%s').\n", pair.name, pair.value);
+		} else if (chan) {
+			ast_log(LOG_WARNING, "MSet: ignoring entry '%s' with no '='\n", pair.name);
 		} else {
 			ast_log(LOG_WARNING, "MSet: ignoring entry '%s' with no '=' (in %s@%s:%d\n", pair.name, chan->exten, chan->context, chan->priority);
 		}