diff options
| author | Klap-in <klapinklapin@gmail.com> | 2013-07-14 13:35:06 +0200 |
|---|---|---|
| committer | Klap-in <klapinklapin@gmail.com> | 2013-07-14 13:35:06 +0200 |
| commit | 33c3b3817b00aa9384760813643fac0e33daaaff (patch) | |
| tree | 481c880b00a32ba5887834b52a17248bac8bfc7c /inc/parser/xhtml.php | |
| parent | 040f0e135c37c5b544f16277ff69205369df5f1f (diff) | |
| parent | fbd8067eeeb9f424981aad8b283e17f734c738c3 (diff) | |
| download | rpg-33c3b3817b00aa9384760813643fac0e33daaaff.tar.gz rpg-33c3b3817b00aa9384760813643fac0e33daaaff.tar.bz2 | |
merge master in branch
Diffstat (limited to 'inc/parser/xhtml.php')
| -rw-r--r-- | inc/parser/xhtml.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 71f3aa4bf..84a999e56 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -803,7 +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); - $link['title'] .= ' (' . filesize_h(filesize(mediaFN($src))).')'; + if ($exists) $link['title'] .= ' (' . filesize_h(filesize(mediaFN($src))).')'; } if($hash) $link['url'] .= '#'.$hash; @@ -889,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(); } |