diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2006-07-30 22:14:42 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2006-07-30 22:14:42 +0200 |
| commit | 852896dac73e74fd791a001b8ea6bf23aa9e7791 (patch) | |
| tree | 7bbeab81a420bd8f95b197c7d787213ca4e7694c | |
| parent | 4632eafa7edb24a36ed6f545fc11eded4a65f0cf (diff) | |
| download | rpg-852896dac73e74fd791a001b8ea6bf23aa9e7791.tar.gz rpg-852896dac73e74fd791a001b8ea6bf23aa9e7791.tar.bz2 | |
strip trailing line in higlighted code
The current code add 2 unwanted trailing lines in highlighted code. One is produced
by DokuWiki's syntax and is fixed by this patch. The second one is created somewhere
inside GeShi. A bug report was submitted upatream [1]
[1] http://sourceforge.net/tracker/index.php?funcÞtail&aid31373&group_id4997&atidg0231
darcs-hash:20060730201442-7ad00-222a23a3bfccd7c53105e7175cdc9992be2d8076.gz
| -rw-r--r-- | inc/parser/xhtml.php | 3 | ||||
| -rw-r--r-- | inc/parserutils.php | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 3c71bb54e..e8fb84494 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -387,8 +387,9 @@ class Doku_Renderer_xhtml extends Doku_Renderer { if ( is_null($language) ) { $this->preformatted($text); } else { - //strip leading blank line + //strip leading and trailing blank line $text = preg_replace('/^\s*?\n/','',$text); + $text = preg_replace('/\s*?\n$/','',$text); $this->doc .= p_xhtml_cached_geshi($text, $language); } } diff --git a/inc/parserutils.php b/inc/parserutils.php index 1bebfc698..70d73a417 100644 --- a/inc/parserutils.php +++ b/inc/parserutils.php @@ -499,13 +499,12 @@ function p_get_first_heading($id){ * @author Christopher Smith <chris@jalakai.co.uk> */ function p_xhtml_cached_geshi($code, $language) { - $cache = getCacheName($language.$code,".code"); if (@file_exists($cache)) { $highlighted_code = io_readFile($cache, false); - touch($cache); + @touch($cache); } else { |