--- serendipity-nightly/include/functions_comments.inc.php	2009-04-16 18:47:51.000000000 +0200
+++ /var/www/include/functions_comments.inc.php	2009-06-11 17:17:29.000000000 +0200
@@ -1,4 +1,4 @@
-<?php # $Id: functions_comments.inc.php 2500 2009-04-16 16:47:51Z garvinhicking $
+<?php # $Id: functions_comments.inc.php 2376 2008-11-14 10:06:54Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
@@ -893,7 +893,7 @@
     if ($GLOBALS['tb_logging']) {
         fclose($fp);
     }
-    
+
     return $cid;
 }
 
@@ -960,8 +960,7 @@
             fclose($fp);
         }
                         
-        serendipity_insertComment($id, $commentInfo, $type, $source, $ca);
-        $commentInfo['comment_id'] = $id;
+        $commentInfo['comment_id'] = serendipity_insertComment($id, $commentInfo, $type, $source, $ca);
         serendipity_plugin_api::hook_event('frontend_saveComment_finish', $ca, $commentInfo);
         return true;
     } else {