From 97ff45eb45a54b57ed92dc088774781240647639 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 18 Mar 2013 17:46:16 +0000
Subject: [PATCH] Aerodrome 1.0.5

---
 CHANGELOG.txt       |  5 ++-
 comments.php        |  9 +++--
 functions.php       |  7 ----
 index.php           |  2 +-
 legacy.comments.php | 90 ---------------------------------------------
 search.php          |  2 +-
 sidebar.php         |  8 ++++
 single.php          |  3 --
 style.css           |  2 +-
 9 files changed, 21 insertions(+), 107 deletions(-)
 delete mode 100644 legacy.comments.php

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3b68f6f..5668489 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,7 +4,10 @@ AERODROME
  
     CHANGELOG
     
-	V 1.0.3
+	V 1.0.5
+	Bugfix comment miscount WP 2.9
+	
+	V 1.0.3-1.0.4
 	
 	Added customizeable Link section below Header
 	Added beautiful subpages menu on top
diff --git a/comments.php b/comments.php
index f82098e..d67046d 100644
--- a/comments.php
+++ b/comments.php
@@ -8,11 +8,13 @@
 	}
 ?>
 
+        <!--
 	<h2 id="comments"><?php comments_number(__('No Comments'), __('1 Comment'), __('% Comments')); ?>
 	<?php if ( comments_open() ) : ?>
 	         <a href="#postcomment" title="<?php _e("Leave a comment"); ?>">&raquo;</a>
 	<?php endif; ?>
 	</h2>
+        -->
 
 
 <?php if ( have_comments() ) : ?>
@@ -34,17 +36,18 @@
 		<!-- If comments are open, but there are no comments. -->
 
 	 <?php else : // comments are closed ?>
-		<!-- If comments are closed. -->
-		<p class="nocomments">Comments are closed.</p>
+		<!-- If comments are closed. 
+		<p class="nocomments">Comments are closed.</p>-->
 
 	<?php endif; ?>
 <?php endif; ?>
 
+        <!--
 	<p style="font-size:12px;"><?php post_comments_feed_link(__('RSS feed for comments on this post.')); ?>
 	<?php if ( pings_open() ) : ?>
 	         <a href="<?php trackback_url() ?>" rel="trackback"><?php _e('TrackBack URL'); ?></a>
 	<?php endif; ?>
-	</p>
+	</p>-->
 <hr>
 <?php if ('open' == $post->comment_status) : ?>
 
diff --git a/functions.php b/functions.php
index 92e6078..a29aba8 100644
--- a/functions.php
+++ b/functions.php
@@ -134,11 +134,4 @@ function aero_admin_header() { ?>
 add_action('admin_head', 'aero_admin_header');
 add_action('admin_menu', 'aero_add_admin');
 
-?>
-<?php
-add_filter('comments_template', 'legacy_comments');
-function legacy_comments($file) {
-	if(!function_exists('wp_list_comments')) 	$file = TEMPLATEPATH . '/legacy.comments.php';
-	return $file;
-}
 ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 3689c9b..dd10bb7 100644
--- a/index.php
+++ b/index.php
@@ -17,7 +17,7 @@ get_header();
 
          <!-- if you don't want the comment count left of the post, erase from here ... -->
          <div class="commy">
-         <?php comments_popup_link(__('0'), __('1'), __('%'), '', __('--')); ?>    
+<?php comments_popup_link( '0', '1', '%', 'comments-link', '-'); ?>    
          </div><!-- end commy -->
          <!-- to here -->
 
diff --git a/legacy.comments.php b/legacy.comments.php
deleted file mode 100644
index f87f23b..0000000
--- a/legacy.comments.php
+++ /dev/null
@@ -1,90 +0,0 @@
-	<?php if ( !empty($post->post_password) && $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) : ?>
-
-                 <p><?php _e('Enter your password to view comments.'); ?></p>
-
-         <?php return; endif; ?>
-
-	<h2 id="comments"><?php comments_number(__('No Comments'), __('1 Comment'), __('% Comments')); ?>
-	<?php if ( comments_open() ) : ?>
-	         <a href="#postcomment" title="<?php _e("Leave a comment"); ?>">&raquo;</a>
-	<?php endif; ?>
-	</h2>
-
-
-<?php if ( $comments ) : ?>
-
-	<ul id="commentlist">
-
-	<?php foreach ($comments as $comment) : ?>
-	         <li>
-
-	         <!--Change the gravatar size by replacing '70' with bigger resp. smaller sizes-->
-                 <div class="authorcomm">
-	         
-                 <?php echo get_avatar( $comment, 70 ); ?>
-
-                 <?php comment_author_link() ?>
-                 </div>
-	         <?php comment_text() ?>
-
-	         <div class="meta"><?php comment_type(__('Comment'), __('Trackback'), __('Pingback')); ?> | <?php comment_date() ?> <?php edit_comment_link(__("Edit This"), ' |'); ?></div>
-	         </li>
-
-	<?php endforeach; ?>
-
-	</ul>
-
-
-
-<?php else : ?>
-
-<?php endif; ?>
-
-	<p style="font-size:12px;"><?php post_comments_feed_link(__('RSS feed for comments on this post.')); ?>
-	<?php if ( pings_open() ) : ?>
-	         <a href="<?php trackback_url() ?>" rel="trackback"><?php _e('TrackBack URL'); ?></a>
-	<?php endif; ?>
-	</p>
-
-<?php if ( comments_open() ) : ?>
-	<h2 id="postcomment"><?php _e('Leave a comment'); ?></h2>
-
-<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), 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 %s.'), '<a href="'.get_option('siteurl').'/wp-admin/profile.php">'.$user_identity.'</a>'); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Log out &raquo;'); ?></a></p>
-
-	         <?php else : ?>
-
-	         <p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
-	         <label for="author"><small><?php _e('Name'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
-
-	         <p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
-	         <label for="email"><small><?php _e('Mail (will not be published)');?> <?php if ($req) _e('(required)'); ?></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'); ?></small></label></p>
-
-	         <?php endif; ?>
-
-	         <!--<p><small><strong>XHTML:</strong> <?php printf(__('You can use these tags: %s'), 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 echo attribute_escape(__('Submit Comment')); ?>" />
-	         <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 else : // Comments are closed ?>
-<p><?php _e('Sorry, the comment form is closed at this time.'); ?></p>
-<?php endif; ?>
\ No newline at end of file
diff --git a/search.php b/search.php
index 7b815fc..fa4d290 100644
--- a/search.php
+++ b/search.php
@@ -12,7 +12,7 @@
 
          <!-- if you don't want the comment count left of the post, erase from here ... -->
          <div class="commy">
-         <?php comments_popup_link(__('0'), __('1'), __('%'), '', __('--')); ?>    
+<?php comments_popup_link( '0', '1', '%', 'comments-link', '-'); ?>   
          </div><!-- end commy -->
          <!-- to here -->
 
diff --git a/sidebar.php b/sidebar.php
index 56fab0f..834b383 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -2,6 +2,14 @@
 
 <div id="sidebar">
 
+<ul>
+<?php         /* Widgetized sidebar, if you have the plugin installed. */
+                if ( !function_exists('dynamic_sidebar') || !dynamic_sidebar("Left Sidebar") ) : ?>
+
+<?php endif; ?>
+
+</ul>
+<br /><br /><br />
 <div id="search">
 <ul>
  <li style="margin-top:0px;">
diff --git a/single.php b/single.php
index 04cf8b8..ff4c367 100644
--- a/single.php
+++ b/single.php
@@ -34,9 +34,6 @@ Written by <?php the_author() ?><?php _e(" in:"); ?> <?php the_category(',') ?>
 
         </div><!-- end meta -->
 
-
-<?php comments_template(); ?>
-
      </div><!-- end storywrap -->
 
 </div><!-- end post -->
diff --git a/style.css b/style.css
index a0de9d0..2785421 100644
--- a/style.css
+++ b/style.css
@@ -5,7 +5,7 @@ Description: Beautiful light and professional designed, ad ready WordPress theme
 Author: Joe Fischler
 Author URI: http://thebuckmaker.com
 Tags: blue, green, light, three-columns, fixed-width, theme-options, threaded-comments
-Version: 1.0.4
+Version: 1.0.5
 */
 
 
-- 
2.39.5