diff options
| author | Michal Rezler <rezlemic@fel.cvut.cz> | 2011-04-08 22:38:27 +0200 |
|---|---|---|
| committer | Michal Rezler <rezlemic@fel.cvut.cz> | 2011-04-08 22:38:27 +0200 |
| commit | 5e8ffd73fd2a48f7a78e085ca7ed0dda73fb8af7 (patch) | |
| tree | 7d6e598c52037249f707989a962e89481ca4afa2 /inc/parser/xhtml.php | |
| parent | ff482cae0f5a620704d845037d60ae13ab851410 (diff) | |
| parent | fda14ffc7c57c4451df9196e8125cd39b1d5c134 (diff) | |
| download | rpg-5e8ffd73fd2a48f7a78e085ca7ed0dda73fb8af7.tar.gz rpg-5e8ffd73fd2a48f7a78e085ca7ed0dda73fb8af7.tar.bz2 | |
Merge branch 'master' of git://github.com/splitbrain/dokuwiki
Diffstat (limited to 'inc/parser/xhtml.php')
| -rw-r--r-- | inc/parser/xhtml.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 9405d9420..ab295dd01 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -574,11 +574,20 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $params = $parts[1]; } + // For empty $id we need to know the current $ID + // We need this check because _simpleTitle needs + // correct $id and resolve_pageid() use cleanID($id) + // (some things could be lost) + if ($id === '') { + $id = $ID; + } + // default name is based on $id as given $default = $this->_simpleTitle($id); // now first resolve and clean up the $id resolve_pageid(getNS($ID),$id,$exists); + $name = $this->_getLinkTitle($name, $default, $isImage, $id, $linktype); if ( !$isImage ) { if ( $exists ) { |