[php-blog-cvs] serendipity serendipity_functions.inc.php,1.419.2.64,1.419.2.65

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php 
Log Message:
fix comment preview


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.64
retrieving revision 1.419.2.65
diff -u -d -r1.419.2.64 -r1.419.2.65
--- serendipity_functions.inc.php	4 Nov 2004 13:42:49 -0000	1.419.2.64
+++ serendipity_functions.inc.php	4 Nov 2004 14:27:56 -0000	1.419.2.65
@@ -966,24 +966,6 @@
 
             /* IF WE ARE DISPLAYING A FULL ENTRY */
             if (isset($serendipity['GET']['id'])) {
-                $entry['viewmode'] = ($serendipity['GET']['cview']) ? $serendipity['GET']['cview'] : VIEWMODE_THREADED;
-
-                if (!empty($serendipity['POST']['preview'])) {
-                    serendipity_printComments(
-                        array(
-                            array(
-                                'email'     => $serendipity['POST']['email'],
-                                'username'  => $serendipity['POST']['name'],
-                                'body'      => $serendipity['POST']['comment'],
-                                'url'       => $serendipity['POST']['url'],
-                                'parent_id' => $serendipity['POST']['replyTo'],
-                                'timestamp' => time()
-                            )
-                        ),
-                        $serendipity['POST']['replyTo']
-                    );
-                }
-
                 $serendipity['smarty']->assign(
                     array(
                         'comments_messagestack' => (isset($serendipity['messagestack']['comments']) ? (array)$serendipity['messagestack']['comments'] : false),
@@ -3477,16 +3459,32 @@
 }
 
 function serendipity_smarty_printComments($params, &$smarty) {
-    if ( !isset($params['entry']) ) {
+    global $serendipity;
+
+    if (!isset($params['entry'])) {
         $smarty->trigger_error(__FUNCTION__ .": missing 'entry' parameter");
         return;
     }
 
-    if ( !isset($params['mode']) ) {
+    if (!isset($params['mode'])) {
         $params['mode'] = VIEWMODE_THREADED;
     }
 
-    return serendipity_printComments(serendipity_fetchComments($params['entry']), $params['mode']);
+    $comments = serendipity_fetchComments($params['entry']);
+
+    if (!empty($serendipity['POST']['preview'])) {
+        $comments[] =
+            array(
+                    'email'     => $serendipity['POST']['email'],
+                    'username'  => $serendipity['POST']['name'],
+                    'body'      => $serendipity['POST']['comment'],
+                    'url'       => $serendipity['POST']['url'],
+                    'parent_id' => $serendipity['POST']['replyTo'],
+                    'timestamp' => time()
+            );
+    }
+
+    return serendipity_printComments($comments, $params['mode']);
 }
 
 function serendipity_smarty_printTrackbacks($params, &$smarty) {