[php-blog-cvs] serendipity/include/admin comments.inc.php,1.6,1.7

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

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

Modified Files:
	comments.inc.php 
Log Message:
* fix output of DOCTYPE header in embedded mode to be placed right
* some more return by reference optimising
* unbreak comment moderation
* fix generic rss import when no categories have been created


Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- comments.inc.php	30 Nov 2004 15:53:56 -0000	1.6
+++ comments.inc.php	1 Dec 2004 11:00:56 -0000	1.7
@@ -61,6 +61,9 @@
 /* We are either in edit mode, or preview mode */
 if ( isset($serendipity['GET']['adminAction']) && $serendipity['GET']['adminAction'] == 'edit' || isset($serendipity['POST']['preview'])) {
 
+    $serendipity['smarty_raw_mode'] = true; // Force output of Smarty stuff in the backend
+    serendipity_smarty_init();
+
     /* If we are not in preview, we need data from our database */
     if (!isset($serendipity['POST']['preview']) ) {
         $comment = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}comments WHERE id = ". (int)$serendipity['GET']['id']);
@@ -88,7 +91,7 @@
                 )
               )
             );
-
+        $serendipity['smarty']->display(serendipity_getTemplateFile('comments.tpl', 'serendipityPath'));
     }
 
     serendipity_displayCommentForm(
@@ -96,9 +99,12 @@
       '?serendipity[action]=admin&serendipity[adminModule]=comments&serendipity[adminAction]=doEdit&serendipity[id]=' . $serendipity['GET']['id'] . '&serendipity[entry_id]=' . $serendipity['GET']['entry_id'],
       NULL,
       $data,
+      false,
       false
     );
 
+    $serendipity['smarty']->display(serendipity_getTemplateFile('commentform.tpl', 'serendipityPath'));
+
     return true;
 }