[asterisk-commits] file: trunk r73931 - in /trunk: ./ pbx/pbx_config.c

[SVN commits to the Asterisk project]

Author: file
Date: Sun Jul  8 20:17:28 2007
New Revision: 73931

URL: http://svn.digium.com/view/asterisk?view=rev&rev=73931
Log:
Merged revisions 73930 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r73930 | file | 2007-07-08 22:13:57 -0300 (Sun, 08 Jul 2007) | 2 lines

Add a few sanity checks when writing out the dialplan. (issue #10157 reported by dome)

........

Modified:
    trunk/   (props changed)
    trunk/pbx/pbx_config.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_config.c?view=diff&rev=73931&r1=73930&r2=73931
==============================================================================
--- trunk/pbx/pbx_config.c (original)
+++ trunk/pbx/pbx_config.c Sun Jul  8 20:17:28 2007
@@ -883,9 +883,9 @@
 						incomplete = 1;	/* error encountered or label > 125 chars */
 					
 					fprintf(output, "exten => %s%s%s,%d%s,%s(%s)\n",
-					    ast_get_extension_name(p), sep, cid,
+					    ast_get_extension_name(p), (ast_strlen_zero(sep) ? "" : sep), (ast_strlen_zero(cid) ? "" : cid),
 					    ast_get_extension_priority(p), label,
-					    ast_get_extension_app(p), tempdata);
+					    ast_get_extension_app(p), (ast_strlen_zero(tempdata) ? "" : tempdata));
 				}
 			}
 		}