r9751 - helma-ng/trunk/modules/helma
[email protected] Thu, 14 May 2009 15:18:27 +0200 (CEST)
| Newsgroups | gmane.comp.java.helma.cvs |
|---|---|
| Message-ID | <20090514131827.09BA33D0D6@mia> |
Author: hannes
Date: 2009-05-14 15:18:26 +0200 (Thu, 14 May 2009)
New Revision: 9751
Modified:
helma-ng/trunk/modules/helma/skin.js
Log:
Return empty string if render macro is called without argument (prevents endless recursion bug)
Details at http://dev.helma.org/trac/helma/changeset/9751
Modified: helma-ng/trunk/modules/helma/skin.js
===================================================================
--- helma-ng/trunk/modules/helma/skin.js 2009-05-14 13:18:23 UTC (rev 9750)
+++ helma-ng/trunk/modules/helma/skin.js 2009-05-14 13:18:26 UTC (rev 9751)
@@ -226,7 +226,7 @@
var builtin = {
"render": function(macro, context) {
var skin = getEvaluatedParameter(macro.getParameter(0), context, 'render:skin');
- return self.renderSubskin(skin, context);
+ return skin == null ? "" : self.renderSubskin(skin, context);
},
"echo": function(macro, context) {