diff options
| author | Guy Brand <gb@unistra.fr> | 2013-03-06 14:08:08 +0100 |
|---|---|---|
| committer | Guy Brand <gb@unistra.fr> | 2013-03-06 14:08:08 +0100 |
| commit | 23678e344b4ddcad14254c106ecb93af174fdaa0 (patch) | |
| tree | a5c787e4d87313a7fb6f18cb4c78bf210d92d60c /inc/parser/xhtml.php | |
| parent | 847cef0a6bfd2ff9dc54e1fc140f5ba0ece0017a (diff) | |
| parent | 5721a1547938df76003c6d91ea003dc1c70abd94 (diff) | |
| download | rpg-23678e344b4ddcad14254c106ecb93af174fdaa0.tar.gz rpg-23678e344b4ddcad14254c106ecb93af174fdaa0.tar.bz2 | |
Merge branch 'master' into stable
Diffstat (limited to 'inc/parser/xhtml.php')
| -rw-r--r-- | inc/parser/xhtml.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index b4e78a530..84a999e56 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -30,6 +30,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { var $toc = array(); // will contain the Table of Contents var $sectionedits = array(); // A stack of section edit data + private $lastsecid = 0; // last section edit id, used by startSectionEdit var $headers = array(); var $footnotes = array(); @@ -50,9 +51,8 @@ class Doku_Renderer_xhtml extends Doku_Renderer { * @author Adrian Lang <lang@cosmocode.de> */ public function startSectionEdit($start, $type, $title = null) { - static $lastsecid = 0; - $this->sectionedits[] = array(++$lastsecid, $start, $type, $title); - return 'sectionedit' . $lastsecid; + $this->sectionedits[] = array(++$this->lastsecid, $start, $type, $title); + return 'sectionedit' . $this->lastsecid; } /** @@ -803,6 +803,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext); $link['class'] .= ' mediafile mf_'.$class; $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),true); + if ($exists) $link['title'] .= ' (' . filesize_h(filesize(mediaFN($src))).')'; } if($hash) $link['url'] .= '#'.$hash; @@ -888,7 +889,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer { // title is escaped by SimplePie, we unescape here because it // is escaped again in externallink() FS#1705 $this->externallink($item->get_permalink(), - htmlspecialchars_decode($item->get_title())); + html_entity_decode($item->get_title(), ENT_QUOTES, 'UTF-8')); }else{ $this->doc .= ' '.$item->get_title(); } |