Re: [php-blog-cvs] serendipity serendipity_functions.inc.php,1.87,1.88

[Sterling H. <ste...@bu...>]

Please revert, I have a proper fix coming in a moment.

-Sterling

On Thu, 2003-07-03 at 17:49, tom...@us... wrote:
> Update of /cvsroot/php-blog/serendipity
> In directory sc8-pr-cvs1:/tmp/cvs-serv6679
> 
> Modified Files:
> 	serendipity_functions.inc.php 
> Log Message:
> Removed utf8_encode() from RSS feeds.
> It caused wrong display of certain non-english chars
> 
> 
> Index: serendipity_functions.inc.php
> ===================================================================
> RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
> retrieving revision 1.87
> retrieving revision 1.88
> diff -u -d -r1.87 -r1.88
> --- serendipity_functions.inc.php	29 Jun 2003 20:34:57 -0000	1.87
> +++ serendipity_functions.inc.php	3 Jul 2003 21:49:47 -0000	1.88
> @@ -721,7 +721,7 @@
>  function serendipity_printEntries_rss($entries, $version) {
>      global $serendipity;
>  
> -    if ($version == '0.91' || $version == '2.0' && is_array($entries)) {
> +    if ( ($version == '0.91') || ($version == '2.0') && is_array($entries) ) {
>          foreach ($entries as $entry) {
>              echo "<item>\n";
>              echo "<title>".htmlentities($entry['title'])."</title>\n";
> @@ -730,14 +730,15 @@
>                  // extract author information
>                  $query = "select email from {$serendipity['dbPrefix']}authors where username='{$entry['username']}'";
>                  $results = serendipity_db_query($query);
> +                
>                  echo '<author>' . htmlentities($results[0]['email']) . ' (' . htmlentities($entry['username']) . ")</author>\n";
>                  echo "<content:encoded>\n";
> -                echo utf8_encode(htmlspecialchars(serendipity_emoticate(serendipity_markup_text($entry['body']))));
> +                echo htmlspecialchars(serendipity_emoticate(serendipity_markup_text($entry['body'])));
>                  echo "\n</content:encoded>\n";
>                  echo '<pubDate>' . date("r", $entry['timestamp']) . "</pubDate>\n";
>                  echo "<guid>{$serendipity['baseURL']}archives/{$entry['id']}_".serendipity_makeFilename($entry['title']).".html</guid>\n";
>              } else {
> -                echo "<description>\n" . utf8_encode(htmlspecialchars($entry['body'])) . "\n</description>\n";
> +                echo "<description>\n" . htmlspecialchars($entry['body']) . "\n</description>\n";
>              }
>              echo "</item>\n";
>          }
> 
> 
> 
> 
> -------------------------------------------------------
> This SF.Net email sponsored by: Free pre-built ASP.NET sites including
> Data Reports, E-commerce, Portals, and Forums are available now.
> Download today and enter to win an XBOX or Visual Studio .NET.
> http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
> _______________________________________________
> php-blog-cvs mailing list
> php...@li...
> https://lists.sourceforge.net/lists/listinfo/php-blog-cvs
-- 
"Whether you think you can or think you can't -- you are right." 
    - Henry Ford