Author: sdumitriu
Date: 2008-02-11 00:18:37 +0100 (Mon, 11 Feb 2008)
New Revision: 7479
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/resources/radeox_markup_xwiki.properties
Log:
XWIKI-2080: Server hangs while rendering certain pages
Fixed.
Merged from [EMAIL PROTECTED]
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/resources/radeox_markup_xwiki.properties
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/resources/radeox_markup_xwiki.properties
2008-02-10 23:16:09 UTC (rev 7478)
+++
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/resources/radeox_markup_xwiki.properties
2008-02-10 23:18:37 UTC (rev 7479)
@@ -11,17 +11,17 @@
macro.charting.name=chart
# Added *strong* markup
-filter.strong.match=(?<!\\*)\\*([^\\p{Space}](?:[^*\n]*+\\*??)*?(?<=[^\\p{Space}]))\\*(?!\\*)
+filter.strong.match=(?<!\\*)\\*([^\\p{Space}](?:[^*\n]*+|\\*)*?(?<=[^\\p{Space}]))\\*(?!\\*)
filter.strong.print=<strong class=\"strong\">$1</strong>
# Added __underline__ markup
-filter.underline.match=(?<!_)__([^\\p{Space}](?:[^_\n]*+_??)*?(?<=[^\\p{Space}]))__(?!_)
+filter.underline.match=(?<!_)__([^\\p{Space}](?:[^_\n]*+|_)*?(?<=[^\\p{Space}]))__(?!_)
filter.underline.print=<span class=\"underline\">$1</span>
-filter.strikethrough.match=(?<![-!])--([^\\p{Space}>](?:[^-\n]*+-??)*?(?<=[^\\p{Space}]))--(?!-)
+filter.strikethrough.match=(?<![-!])--([^\\p{Space}>](?:[^-\n]*+|-)*?(?<=[^\\p{Space}]))--(?!-)
filter.strikethrough.print=<del>$1</del>
-filter.italic.match=(?<!~)~~([^\\p{Space}](?:[^~\n]*+~??)*?(?<=[^\\p{Space}]))~~(?!~)
+filter.italic.match=(?<!~)~~([^\\p{Space}](?:[^~\n]*+|~)*?(?<=[^\\p{Space}]))~~(?!~)
filter.italic.print=<em class=\"italic\">$1</em>
#Modified this filter to not filter HTML
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
