[php-blog-cvs] serendipity serendipity_functions.inc.php,1.419.2.9,1.419.2.10

[Tom S. <tom...@us...>]

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php 
Log Message:
- Fix display of extended entries
- Don't force CSS from within Serendipity, leave it up to each template


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.9
retrieving revision 1.419.2.10
diff -u -d -r1.419.2.9 -r1.419.2.10
--- serendipity_functions.inc.php	10 Sep 2004 17:39:19 -0000	1.419.2.9
+++ serendipity_functions.inc.php	10 Sep 2004 21:59:36 -0000	1.419.2.10
@@ -1125,15 +1125,13 @@
                 $entry['entryLink']    = serendipity_archiveURL($entry['id'], $entry['title'], 'serendipityHTTPPath');
                 $entry['rdf_ident']    = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL');
                 $entry['title']        = htmlspecialchars($entry['title']);
-                $entry['extended_css'] = 'serendipity_entry_body_folded';
                 $entry['commURL']      = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false);
-
-                if ($extended && strlen($entry['extended'])) {
+                
+                if (!$extended && strlen($entry['extended'])) {
                     $entry['has_extended']      = true;
-                    $entry['extended_css']      = 'serendipity_entry_body_unfolded';
                 }
 
-                if (isset($entry['exflag']) && $entry['exflag']) {
+                if (isset($entry['exflag']) && $entry['exflag'] && $extended) {
                     $entry['is_extended']       = true;
                 }