Revert "use comment_form() otherwise commenting is broken"

This reverts commit b279c59552d85cb65dff654726f9777af5237215.

wp-content/themes/minimalism/comments.php

@@ -19,7 +19,7 @@
 
 <!-- You can start editing here. -->
 
-<?php if ( have_comments() ) : ?>
+<?php if ($comments) : ?>
 	<h3 id="comments"><?php comments_number(__('No Responses', 'minimalism'), __('One Response', 'minimalism'), __('% Responses', 'minimalism'));?> <?php printf(__('to &#8220;%s&#8221;', 'minimalism'), the_title('', '', false)); ?></h3>
 
 	<ol class="commentlist">
@@ -61,7 +61,45 @@
 	<?php endif; ?>
 <?php endif; ?>
 
-<?php comment_form( array('comment_notes_after' => '',
-                          'comment_notes_before'=> '')
-                  );
-?>
+
+<?php if ('open' == $post->comment_status) : ?>
+
+<h3 id="respond"><?php _e('Leave a Reply', 'minimalism'); ?></h3>
+
+<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
+<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'minimalism'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?></p>
+<?php else : ?>
+
+<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+
+<?php if ( $user_ID ) : ?>
+
+<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'minimalism'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account', 'minimalism'); ?>"><?php _e('Log out &raquo;', 'minimalism'); ?></a></p>
+
+<?php else : ?>
+
+<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
+<label for="author"><small><?php _e('Name', 'minimalism'); ?> <?php if ($req) _e("(required)", "kubrick"); ?></small></label></p>
+
+<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
+<label for="email"><small><?php _e('Mail (will not be published)', 'minimalism'); ?> <?php if ($req) _e("(required)", "kubrick"); ?></small></label></p>
+
+<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
+<label for="url"><small><?php _e('Website', 'minimalism'); ?></small></label></p>
+
+<?php endif; ?>
+
+<!--<p><small><?php printf(__('<strong>XHTML:</strong> You can use these tags: <code>%s</code>', 'minimalism'), allowed_tags()); ?></small></p>-->
+
+<p><textarea name="comment" id="comment" cols="100%" rows="10" tabindex="4"></textarea></p>
+
+<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'minimalism'); ?>" />
+<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
+</p>
+<?php do_action('comment_form', $post->ID); ?>
+
+</form>
+
+<?php endif; // If registration required and not logged in ?>
+
+<?php endif; // if you delete this the sky will fall on your head ?>