diff options
Diffstat (limited to 'inc/parser')
| -rw-r--r-- | inc/parser/handler.php | 21 | ||||
| -rw-r--r-- | inc/parser/xhtml.php | 1 |
2 files changed, 20 insertions, 2 deletions
diff --git a/inc/parser/handler.php b/inc/parser/handler.php index 1d7af1864..91d884345 100644 --- a/inc/parser/handler.php +++ b/inc/parser/handler.php @@ -1147,7 +1147,11 @@ class Doku_Handler_Section { } -//------------------------------------------------------------------------ +/** + * Handler for paragraphs + * + * @author Harry Fuecks <harryf@gmail.com> + */ class Doku_Handler_Block { var $calls = array(); @@ -1186,6 +1190,13 @@ class Doku_Handler_Block { 'footnote_close','section_close', ); + /** + * Close a paragraph if needed + * + * This function makes sure there are no empty paragraphs on the stack + * + * @author Andreas Gohr <andi@splitbrain.org> + */ function closeParagraph($pos){ // look back if there was any content - we don't want empty paragraphs $content = ''; @@ -1208,6 +1219,13 @@ class Doku_Handler_Block { } } + /** + * Processes the whole instruction stack to open and close paragraphs + * + * @author Harry Fuecks <harryf@gmail.com> + * @author Andreas Gohr <andi@splitbrain.org> + * @todo This thing is really messy and should be rewritten + */ function process($calls) { foreach ( $calls as $key => $call ) { @@ -1371,6 +1389,7 @@ class Doku_Handler_Block { $this->inParagraph = $state[1]; } } + //------------------------------------------------------------------------ define('DOKU_TOC_OPEN',1); define('DOKU_TOCBRANCH_OPEN',2); diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 63f79d17c..9df02c942 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -436,7 +436,6 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $name = $this->_getLinkTitle($name, $this->_simpleTitle($id), $isImage, $id); resolve_pageid(getNS($ID),$id,$exists); - if ( !$isImage ) { if ( $exists ) { $class='wikilink1'; |