Index: JSPWikiMarkupParser.java
===================================================================
RCS file: /p/cvs/JSPWiki/src/com/ecyrd/jspwiki/parser/JSPWikiMarkupParser.java,v
retrieving revision 1.17
diff -u -r1.17 JSPWikiMarkupParser.java
--- JSPWikiMarkupParser.java	14 Nov 2005 22:24:02 -0000	1.17
+++ JSPWikiMarkupParser.java	15 Nov 2005 13:50:02 -0000
@@ -1900,12 +1900,24 @@
         //
 
         ch = nextToken();
+        int nesting = 0;    // Check for nested plugins
 
         while( ch != -1 )
         {
-            if( ch == ']' && (!isPlugin || sb.charAt( sb.length()-1 ) == '}' ) )
-            {
-                break;
+            if (isPlugin) {
+                if (ch == '[') {
+                    nesting += 1;
+                }
+                if (nesting == 0 && ch == ']' && sb.charAt(sb.length()-1) == '}') {
+                    break;
+                }
+                if (ch == ']') {
+                    nesting -= 1;
+                }
+            } else {
+                if (ch == ']') {
+                    break;
+                }
             }
 
             sb.append( (char) ch );