Update of /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4366/plugins/serendipity_plugin_remoterss
Modified Files:
Tag: branch-smarty
serendipity_plugin_remoterss.php
Log Message:
MFH
Index: serendipity_plugin_remoterss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_remoterss/serendipity_plugin_remoterss.php,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- serendipity_plugin_remoterss.php 20 Sep 2004 14:32:26 -0000 1.5.2.1
+++ serendipity_plugin_remoterss.php 13 Oct 2004 10:45:58 -0000 1.5.2.2
@@ -405,11 +405,11 @@
if (empty($item['title'])) {
continue;
}
- $content .= '<a href="' . $item['link'] . '" target="'.$target.'">';
+ $content .= '<a href="' . $this->rss_utf8_decode($item['link']) . '" target="'.$target.'">';
if (!empty($bulletimg)) {
$content .= '<img src="' . $bulletimg . '" border="0" alt="*" /> ';
}
- $content .= $item['title'] . "</a><br />\n";
+ $content .= $this->rss_utf8_decode($item['title']) . "</a><br />\n";
$item['timestamp'] = strtotime(isset($item['pubdate']) ? $item['pubdate'] : $item['dc:date']);
if (!($item['timestamp'] == -1) AND ($displaydate == 'true')) {
$content .= '<div class="serendipitySideBarDate">'
@@ -446,23 +446,23 @@
$content = '';
while (($showAll || ($i < $number)) && ($item = $opml->getOPMLOutlineAttr($opmltree, $i))) {
if (!empty($item['url'])) {
- $url = $item['url'];
+ $url = $this->rss_utf8_decode($item['url']);
} elseif (!empty($item['htmlUrl'])) {
- $url = $item['htmlUrl'];
+ $url = $this->rss_utf8_decode($item['htmlUrl']);
} elseif (!empty($item['xmlUrl'])) {
- $url = $item['xmlUrl'];
+ $url = $this->rss_utf8_decode($item['xmlUrl']);
} elseif (!empty($item['urlHTTP'])) {
- $url = $item['urlHTTP'];
+ $url = $this->rss_utf8_decode($item['urlHTTP']);
} else {
$url = '';
}
if (!empty($item['text'])) {
- $text = htmlspecialchars($item['text']);
+ $text = htmlspecialchars($this->rss_utf8_decode($item['text']));
} elseif (!empty($item['title'])) {
- $text = htmlspecialchars($item['title']);
+ $text = htmlspecialchars($this->rss_utf8_decode($item['title']));
} elseif (!empty($item['description'])) {
- $text = htmlspecialchars($item['description']);
+ $text = htmlspecialchars($this->rss_utf8_decode($item['description']));
} else {
$text = '';
}
@@ -510,6 +510,14 @@
echo PLUGIN_REMOTERSS_NOURI;
}
}
+
+ function rss_utf8_decode($string) {
+ if (strtolower(LANG_CHARSET) != 'utf-8') {
+ return utf8_decode($string);
+ } else {
+ return $string;
+ }
+ }
}
/* vim: set sts=4 ts=4 expandtab : */
|
