Index: inc/public/class.dc.template.php
===================================================================
--- inc/public/class.dc.template.php	(revision 2949)
+++ inc/public/class.dc.template.php	(working copy)
@@ -2051,12 +2051,7 @@
 	*/
 	public function Comments($attr,$content)
 	{
-		$p =
-		"if (\$_ctx->posts !== null) { ".
-			"\$params['post_id'] = \$_ctx->posts->post_id; ".
-			"\$core->blog->withoutPassword(false);\n".
-		"}\n";
-		
+		$p="";
 		if (empty($attr['with_pings'])) {
 			$p .= "\$params['comment_trackback'] = false;\n";
 		}
@@ -2075,6 +2070,11 @@
 		if (empty($attr['no_context']))
 		{
 			$p .=
+			"if (\$_ctx->posts !== null) { ".
+				"\$params['post_id'] = \$_ctx->posts->post_id; ".
+				"\$core->blog->withoutPassword(false);\n".
+			"}\n";
+			$p .=
 			'if ($_ctx->exists("categories")) { '.
 				"\$params['cat_id'] = \$_ctx->categories->cat_id; ".
 			"}\n";
