BugTrack/2176 showrss plugin: Use default template if error

[pukiwiki/pukiwiki.git] / plugin / showrss.inc.php

diff --git a/plugin/showrss.inc.php b/plugin/showrss.inc.php
index 9968214..a42157f 100644 (file)
--- a/plugin/showrss.inc.php
+++ b/plugin/showrss.inc.php
@@ -51,10 +51,10 @@ function plugin_showrss_convert()
        }
 
        $class = ($template == '' || $template == 'default') ? 'ShowRSS_html' : 'ShowRSS_html_' . $template;
+       if (! class_exists($class)) $class = 'ShowRSS_html';
+
        if (! is_numeric($cachehour))
                return '#showrss: Cache-lifetime seems not numeric: ' . htmlsc($cachehour) . '<br />' . "\n";
-       if (! class_exists($class))
-               return '#showrss: Template not found: ' . htmlsc($template) . '<br />' . "\n";
        if (! is_url($uri))
                return '#showrss: Seems not URI: ' . htmlsc($uri) . '<br />' . "\n";
 
@@ -272,7 +272,7 @@ class ShowRSS_XML
                // Unescape already-escaped chars (&lt;, &gt;, &amp;, ...) in RSS body before htmlsc()
                $str = strtr($str, array_flip(get_html_translation_table(ENT_COMPAT)));
                // Escape
-               $str = htmlsc($str);
+               $str = htmlsc($str, ENT_COMPAT, $this->encoding);
                // Encoding conversion
                $str = mb_convert_encoding($str, SOURCE_ENCODING, $this->encoding);
                return trim($str);