[interchange-cvs] interchange - heins modified 2 files

[interchange-cvs at icdevgroup.org]

User:      heins
Date:      2004-11-08 18:27:54 GMT
Modified:  code/UI_Tag jsq.coretag jsqn.coretag
Log:
* Fix problem noted by John Rennie, where jsq would not return a valid
  string if passed nothing.

Revision  Changes    Path
1.5       +2 -1      interchange/code/UI_Tag/jsq.coretag


rev 1.5, prev_rev 1.4
Index: jsq.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/jsq.coretag,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jsq.coretag	8 Oct 2004 20:41:49 -0000	1.4
+++ jsq.coretag	8 Nov 2004 18:27:54 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 2002 Interchange Development Group (http://www.icdevgroup.org/)
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: jsq.coretag,v 1.4 2004/10/08 20:41:49 docelic Exp $
+# $Id: jsq.coretag,v 1.5 2004/11/08 18:27:54 mheins Exp $
 
 UserTag jsquote Alias jsq
 UserTag jsq hasEndTag
@@ -19,6 +19,7 @@
 		  or 
 		( s/'/\\'/g,  s/\r/\\r/g, s/(^|[^\\])\$\{?(\w+)\}?/$1' + $2 + '/g, $_ = qq{'$_'} );
 	}
+	@lines = "''" unless @lines;
 	return join (" +\n", @lines);
 }
 EOR



1.4       +2 -1      interchange/code/UI_Tag/jsqn.coretag


rev 1.4, prev_rev 1.3
Index: jsqn.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/jsqn.coretag,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jsqn.coretag	8 Oct 2004 20:41:49 -0000	1.3
+++ jsqn.coretag	8 Nov 2004 18:27:54 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 2002 Interchange Development Group (http://www.icdevgroup.org/)
 # Licensed under the GNU GPL v2. See file LICENSE for details.
-# $Id: jsqn.coretag,v 1.3 2004/10/08 20:41:49 docelic Exp $
+# $Id: jsqn.coretag,v 1.4 2004/11/08 18:27:54 mheins Exp $
 
 UserTag jsqn hasEndTag
 UserTag jsqn NoReparse
@@ -18,6 +18,7 @@
 		  or 
 		( s/'/\\'/g,  s/\r/\\r/g, $_ = qq{'$_'} );
 	}
+	@lines = "''" unless @lines;
 	return join (" +\n", @lines);
 }
 EOR