diff options
| author | root <root@luna.archlinux.org> | 2016-05-21 06:38:45 +0000 |
|---|---|---|
| committer | root <root@luna.archlinux.org> | 2016-05-21 06:38:45 +0000 |
| commit | b88e92b7f0ce508c55de8c6ac5159ef544d480be (patch) | |
| tree | 86b188507543d2670b7ada1caa8f1139d3d5abe9 /extensions | |
| parent | a2bbd243c85ea0e425ee3e8c380aba9f254cee61 (diff) | |
| parent | 7bf2eb8ba09b54cec804446ea39a3e658773fac9 (diff) | |
Merge branch 'master' of https://git.archlinux.org/vhosts/wiki.archlinux.org
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php | 5 | ||||
| -rw-r--r-- | extensions/SyntaxHighlight_GeSHi/tests/parserTests.txt | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php b/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php index 9eed2763..e2da350b 100644 --- a/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php +++ b/extensions/SyntaxHighlight_GeSHi/SyntaxHighlight_GeSHi.class.php @@ -111,8 +111,11 @@ class SyntaxHighlight_GeSHi { public static function parserHook( $text, $args = array(), $parser ) { global $wgUseTidy; + // Replace strip markers (For e.g. {{#tag:syntaxhighlight|<nowiki>...}}) + $out = $parser->mStripState->unstripNoWiki( $text ); + // Don't trim leading spaces away, just the linefeeds - $out = preg_replace( '/^\n+/', '', rtrim( $text ) ); + $out = preg_replace( '/^\n+/', '', rtrim( $out ) ); // Convert deprecated attributes if ( isset( $args['enclose'] ) ) { diff --git a/extensions/SyntaxHighlight_GeSHi/tests/parserTests.txt b/extensions/SyntaxHighlight_GeSHi/tests/parserTests.txt index c6aaa9a4..5d5038c9 100644 --- a/extensions/SyntaxHighlight_GeSHi/tests/parserTests.txt +++ b/extensions/SyntaxHighlight_GeSHi/tests/parserTests.txt @@ -154,3 +154,12 @@ Text <source lang="javascript" enclose="none">var a;</source>. <p>Text <code class="mw-highlight" dir="ltr"><span class="kd">var</span> <span class="nx">a</span><span class="p">;</span></code>. </p> !! end + +!! test +Enclose with nowiki +!! input +{{#tag:syntaxhighlight|<nowiki>foo</nowiki>|lang="text"|inline=none}} +!! result +<p><code class="mw-highlight" dir="ltr">foo</code> +</p> +!! end |