1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/wiki2html.js b/extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/wiki2html.js
index 2d3f442..312e8b4 100644
--- a/extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/wiki2html.js
+++ b/extensions/tinymce/jscripts/tiny_mce/plugins/mediawiki/wiki2html.js
@@ -88,9 +88,9 @@ function wiki2html(s) {
         })
         
         /* BLOCK ELEMENTS */
-        .replace(/(?:^|\n+)([^# =\*<].+)(?:\n+|$)/gm, function (m, l) {
+        .replace(/(?:^\s*|\n+\s*)([^\s\+\|#=\*<].+)(?:\s*\n+|$)/gm, function (m, l) {
             if (l.match(/^\^+$/)) return l;
-            return "\n<p>" + l + "</p>\n";
+            return "<p>" + l + "</p>\n";
         })
 
         .replace(/(?:^|\n)[ ]{2}(.*)+/g, function (m, l) { // blockquotes
@@ -103,7 +103,7 @@ function wiki2html(s) {
             return '<pre>' + m.replace(/(^|\n)[ ]+/g, "$1") + '</pre>';
         })
 
-        .replace(/(?:^|\n)([=]+)(.*)\1/g, function (m, l, t) { // headings
+        .replace(/^([=]+)(.*?)\1/mg, function (m, l, t) { // headings
             return '<h' + l.length + '>' + t + '</h' + l.length + '>';
         })