[php-blog-cvs] serendipity serendipity_functions.inc.php,1.419.2.1,1.419.2.2 serendipity_genpage.inc.php,1.33.2.1,1.33.2.2

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php serendipity_genpage.inc.php 
Log Message:
- Remove unneeded calls to compile of trackbacks.tpl when there is no data to handle


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.1
retrieving revision 1.419.2.2
diff -u -d -r1.419.2.1 -r1.419.2.2
--- serendipity_functions.inc.php	9 Sep 2004 15:02:14 -0000	1.419.2.1
+++ serendipity_functions.inc.php	9 Sep 2004 18:50:13 -0000	1.419.2.2
@@ -239,6 +239,7 @@
     if ($serendipity['smarty_raw_mode']) {
         $serendipity['smarty']->display(serendipity_getTemplateFile('commentform.tpl', 'serendipityPath'));
     }
+    serendipity_smarty_fetch('COMMENTFORM', 'commentform.tpl');
 }
 
 function serendipity_setCookie($name,$value) {
@@ -1178,7 +1179,7 @@
                       )
                     );
 
-                    ob_start(); // TODO: Remove recursion
+                    ob_start(); // TODO: Remove recursion and output buffering
                     serendipity_printComments(
                       serendipity_fetchComments(
                         $entry['id']
@@ -1266,12 +1267,7 @@
       )
     );
 
-    if ($serendipity['smarty_raw_mode']) {
-        serendipity_smarty_fetch('TRACKBACKS',  'trackbacks.tpl');
-        serendipity_smarty_fetch('COMMENTS',    'comments.tpl');
-        serendipity_smarty_fetch('COMMENTFORM', 'commentform.tpl');
-        $serendipity['smarty']->display(serendipity_getTemplateFile('entries.tpl', 'serendipityPath'));
-    }
+    serendipity_smarty_fetch('ENTRIES',    'entries.tpl');
 } // end function serendipity_printEntries
 
 function serendipity_deleteComment($id, $entry_id, $type='comments')
@@ -1529,6 +1525,7 @@
     if ($serendipity['smarty_raw_mode']) {
         $serendipity['smarty']->display(serendipity_getTemplateFile('trackbacks.tpl', 'serendipityPath'));
     }
+    serendipity_smarty_fetch('TRACKBACKS',  'trackbacks.tpl');
 }
 
 function serendipity_approveComment($cid, $entry_id, $force = false) {

Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -d -r1.33.2.1 -r1.33.2.2
--- serendipity_genpage.inc.php	9 Sep 2004 15:02:15 -0000	1.33.2.1
+++ serendipity_genpage.inc.php	9 Sep 2004 18:50:13 -0000	1.33.2.2
@@ -48,12 +48,8 @@
     // Use new Smarty driven templating
     // Watchout: Included files from within the templates need to be fetched in reverse order!
     include_once(serendipity_getTemplateFile('smarty_layout.php', 'serendipityPath'));
-    serendipity_smarty_fetch('TRACKBACKS',  'trackbacks.tpl');
-    serendipity_smarty_fetch('COMMENTS',    'comments.tpl');
-    serendipity_smarty_fetch('COMMENTFORM', 'commentform.tpl');
-    serendipity_smarty_fetch('ENTRIES',    'entries.tpl');
     serendipity_smarty_fetch('CONTENT',    'content.tpl');
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>