diff options
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/feedcreator.class.php | 7 | ||||
| -rw-r--r-- | inc/parser/xhtml.php | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/inc/feedcreator.class.php b/inc/feedcreator.class.php index bbe3220e1..76d2580a5 100644 --- a/inc/feedcreator.class.php +++ b/inc/feedcreator.class.php @@ -916,7 +916,12 @@ class RSSCreator091 extends FeedCreator { $feed.= " <pubDate>".htmlspecialchars($pubDate->rfc822())."</pubDate>\n"; } if ($this->category!="") { - $feed.= " <category>".htmlspecialchars($this->category)."</category>\n"; + // Changed for DokuWiki: multiple categories are possible + if(is_array($this->category)) foreach($this->category as $cat){ + $feed.= " <category>".htmlspecialchars($cat)."</category>\n"; + }else{ + $feed.= " <category>".htmlspecialchars($this->category)."</category>\n"; + } } if ($this->docs!="") { $feed.= " <docs>".FeedCreator::iTrunc(htmlspecialchars($this->docs),500)."</docs>\n"; diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index 3a1eef3e7..2c1061c69 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -101,13 +101,15 @@ class Doku_Renderer_xhtml extends Doku_Renderer { if(count($toc) < 3) return ''; global $lang; - $out = '<div class="toc">'.DOKU_LF; + $out = '<!-- TOC START -->'.DOKU_LF; + $out .= '<div class="toc">'.DOKU_LF; $out .= '<div class="tocheader toctoggle" id="toc__header">'; $out .= $lang['toc']; $out .= '</div>'.DOKU_LF; $out .= '<div id="toc__inside">'.DOKU_LF; $out .= html_buildlist($toc,'toc',array(__CLASS__,'_tocitem')); $out .= '</div>'.DOKU_LF.'</div>'.DOKU_LF; + $out .= '<!-- TOC END -->'.DOKU_LF; return $out; } @@ -928,6 +930,10 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $ret .= '<img src="'.ml($src,array('w'=>$width,'h'=>$height,'cache'=>$cache)).'"'; $ret .= ' class="media'.$align.'"'; + // make left/right alignment for no-CSS view work (feeds) + if($align == 'right') $ret .= ' align="right"'; + if($align == 'left') $ret .= ' align="left"'; + if (!is_null($title)) { $ret .= ' title="'.$this->_xmlEntities($title).'"'; $ret .= ' alt="'.$this->_xmlEntities($title).'"'; |