Aerodrome 1.0.5

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3b68f6fa7777ed03fe40e83af4fa84c6fdbe3c78..5668489e4a13b0a4f720099e405080f1c5f37a71 100644 (file)
--- 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 f82098e63ee840c70c95882c8a419c41eb4c9f6a..d67046dae832354135a52ea82837b3c3404a0290 100644 (file)
--- 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 92e6078ea9f0151f4ad4ccbb03a6cbe139e3da62..a29aba8de2a2ba812fd9d8c066bc51cd10dfa5c2 100644 (file)
--- 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 3689c9b3c2bef24c00f6b64d918bcb5ca3dbad7d..dd10bb7ae171154641736531b7a3d2679ce4f70d 100644 (file)
--- 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 (file)
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 7b815fc71580d7610eeefd14d9c04a2b4d1e0729..fa4d29091432336e2a8b0e2bb2d9668a7d022497 100644 (file)
--- 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 56fab0fb6c04c0a8bb64320e3a7647f4a73413bf..834b383440a34f918e7acfc1164cd0d2f7948568 100644 (file)
--- 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 04cf8b89c4f901e07a00716ebea4b1b14e4bae68..ff4c367e12ea72640fa4875b0faccb046ad1f5c5 100644 (file)
--- 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 a0de9d062acf5082d50e3b1e6ce22f40a8142f2c..278542106481cd4a5cb05b89a116c3589de71dc6 100644 (file)
--- 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
 */