[asterisk-commits] mmichelson: branch 1.6.1 r150306 - in /branches/1.6.1: ./ main/manager.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Oct 16 18:41:50 2008
New Revision: 150306

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

................
r150305 | mmichelson | 2008-10-16 18:41:16 -0500 (Thu, 16 Oct 2008) | 14 lines

Merged revisions 150304 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r150304 | mmichelson | 2008-10-16 18:40:54 -0500 (Thu, 16 Oct 2008) | 6 lines

Reverting changes from commits 150298 and 150301 since
I was mistakenly under the assumption that dialplan functions
*always* required that a channel be present. I need to go
home earlier, I think :)


........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/manager.c

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

Modified: branches/1.6.1/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/manager.c?view=diff&rev=150306&r1=150305&r2=150306
==============================================================================
--- branches/1.6.1/main/manager.c (original)
+++ branches/1.6.1/main/manager.c Thu Oct 16 18:41:50 2008
@@ -1804,10 +1804,7 @@
 	}
 
 	if (varname[strlen(varname) - 1] == ')') {
-		if (!c) {
-			astman_send_error(s, m, "No such channel");
-			return 0;
-		}
+
 		ast_func_read(c, (char *) varname, workspace, sizeof(workspace));
 		varval = workspace;
 	} else {