# HG changeset patch # User Dan # Date 1261147158 18000 # Node ID def792dd9b1bf5699c76a7bb05502d9a971b1eda # Parent b5b8e7ab091403201f8eee35df865cfb4ae17818 Wikitext parer: re-added the tag thing diff -r b5b8e7ab0914 -r def792dd9b1b includes/wikiengine/parse_mediawiki.php --- a/includes/wikiengine/parse_mediawiki.php Fri Dec 18 05:12:02 2009 -0500 +++ b/includes/wikiengine/parse_mediawiki.php Fri Dec 18 09:39:18 2009 -0500 @@ -21,7 +21,8 @@ 'externalnotext' => '#\[((?:https?|irc|ftp)://.+?)\]#', 'mailtonotext' => '#\[mailto:([^ \]]+?)\]#', 'mailtowithtext' => '#\[mailto:([^ \]]+?) (.+?)\]#', - 'hr' => '/^[-]{4,} *$/m' + 'hr' => '/^[-]{4,} *$/m', + 'code' => '/^(?:\r?\n)?(.+?)(?:\r?\n)?<\/code>$/mis' ); private $blockquote_rand_id; diff -r b5b8e7ab0914 -r def792dd9b1b includes/wikiengine/render_xhtml.php --- a/includes/wikiengine/render_xhtml.php Fri Dec 18 05:12:02 2009 -0500 +++ b/includes/wikiengine/render_xhtml.php Fri Dec 18 09:39:18 2009 -0500 @@ -156,6 +156,11 @@ global $email; return $email->encryptEmail($pieces[1], '', '', $pieces[2]); } + + public function code($match) + { + return '
' . htmlspecialchars($match[0]) . '
'; + } } // Alias internal link parsing to RenderMan's method diff -r b5b8e7ab0914 -r def792dd9b1b includes/wikiformat.php --- a/includes/wikiformat.php Fri Dec 18 05:12:02 2009 -0500 +++ b/includes/wikiformat.php Fri Dec 18 09:39:18 2009 -0500 @@ -60,6 +60,7 @@ 'lang', 'templates', 'blockquote', + 'code', 'tables', 'heading', 'hr',