Luke Plant avatar Luke Plant committed a3222fd

Fixed BBCode parser handling for [[\tag]

Thanks to hizel for the initial patch and test

Comments (0)

Files changed (2)

cciw/cciwmain/templatetags/bbcode.py

                     if tagname in _TAGNAMES:
                         # genuine tag
                         if wholematch.startswith('[['):
-                            # in case of "[[tag]blah":
+                            # in case of "[[tag]blah" and "[[/tag]blah"
                             self.push_text_node('[')
-                        if wholematch.startswith('[/'):
+                        if (wholematch.startswith('[/') or
+                            wholematch.startswith('[[/')):
                             # closing
                             self.close_tag_node(tagname)
                         else:

cciw/cciwmain/tests/bbcode.py

     # empty string should return nothing
     ('',
         ''),
+    # [[/tag] test
+    ('[quote]Apple][[/quote]after tag',
+            '<blockquote><div>Apple][</div></blockquote><div>after tag</div>'),
     # Bible:
     ('[bible]test',
         '<blockquote class="bible"><div>test</div></blockquote>'),
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.