[php-blog-cvs] serendipity/include functions.inc.php,1.5,1.6 functions_comments.inc.php,1.6,1.7 functions_entries.inc.php,1.14,1.15

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17766/include

Modified Files:
	functions.inc.php functions_comments.inc.php 
	functions_entries.inc.php 
Log Message:
use   instead of   for unknown entity XML compliance


Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- functions_comments.inc.php	24 Nov 2004 15:52:02 -0000	1.6
+++ functions_comments.inc.php	30 Nov 2004 11:27:55 -0000	1.7
@@ -134,7 +134,7 @@
     foreach ($comments as $comment) {
         if ($comment['parent_id'] == $parent) {
             $i++;
-            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&nbsp;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['username']) ? ANONYMOUS : htmlspecialchars($comment['username'])) . ' ' . ON . ' ' . ucfirst(serendipity_strftime(DATE_FORMAT_SHORT, $comment['timestamp'])) . "</option>\n";
+            $retval .= '<option value="' . $comment['id'] . '"'. ($selected == $comment['id'] || (isset($serendipity['POST']['replyTo']) && $comment['id'] == $serendipity['POST']['replyTo']) ? ' selected="selected"' : '') .'>' . str_repeat('&#160;', $level * 2) . '#' . $indent . $i . ': ' . (empty($comment['username']) ? ANONYMOUS : htmlspecialchars($comment['username'])) . ' ' . ON . ' ' . ucfirst(serendipity_strftime(DATE_FORMAT_SHORT, $comment['timestamp'])) . "</option>\n";
             $retval .= serendipity_generateCommentList($id, $comments, $selected, $comment['id'], $level + 1, $indent . $i . '.');
         }
     }

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- functions_entries.inc.php	29 Nov 2004 10:53:55 -0000	1.14
+++ functions_entries.inc.php	30 Nov 2004 11:27:56 -0000	1.15
@@ -1038,21 +1038,20 @@
                     if (!empty($xmlImg)) {
                         $ret .= sprintf(
                           '<div style="padding-bottom: 2px;">' .
-                          '<a href="%s" title="%s"><img alt="xml" %s src="%s" style="vertical-align: bottom" /></a>&nbsp;%s' .
+                          '<a href="%s" title="%s"><img alt="xml" src="%s" style="vertical-align: bottom; display: inline; border: 0px" /></a>&#160;%s' .
                           '<a href="%s" title="%s">%s</a>' .
                           '</div>',
                           $serendipity['serendipityHTTPPath'] . 'rss.php?category=' . $cat['categoryid'] . '_' . $category_id,
                           htmlspecialchars($cat['category_description']),
-                          ($serendipity['XHTML11'] ? 'style="display: inline; border: 0px"' : 'border="0"'),
                           $xmlImg,
-                          str_repeat('&nbsp;', $level * 3),
+                          str_repeat('&#160;', $level * 3),
                           serendipity_rewriteURL(PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . $category_id, 'serendipityHTTPPath'),
                           htmlspecialchars($cat['category_description']),
                           htmlspecialchars($cat['category_name']));
                     } else {
                         $ret .= sprintf(
                           '%s<a href="%s" title="%s">%s</a><br />',
-                          str_repeat('&nbsp;', $level * 3),
+                          str_repeat('&#160;', $level * 3),
                           serendipity_rewriteURL(PATH_CATEGORIES . '/' . $cat['categoryid'] . '-' . $category_id, 'serendipityHTTPPath'),
                           htmlspecialchars($cat['category_description']),
                           htmlspecialchars($cat['category_name']));

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- functions.inc.php	29 Nov 2004 07:39:15 -0000	1.5
+++ functions.inc.php	30 Nov 2004 11:27:55 -0000	1.6
@@ -326,12 +326,14 @@
         '/\&([\s\<])/',       // ampersand followed by whitespace or tag
         '/\&$/',              // ampersand at end of body
         '/<(br|hr|img)([^\/>]*)>/i',    // unclosed br tag - attributes included
+        '/\&nbsp;/'
     );
 
     static $r = array(
         '&amp;\1',
         '&amp;',
-        '<\1\2 />'
+        '<\1\2 />',
+        '&#160;'
     );
 
     return preg_replace($p, $r, $html);