Skip to content
Browse files

Fix for Feeds & Feedburner, added a clear for the widgets

  • Loading branch information...
1 parent 3538b01 commit 7924f6e41a59ee1d58b6604add4101ee3dbf80b3 @Frumph committed Dec 17, 2012
Showing with 12 additions and 29 deletions.
  1. +2 −2 functions.php
  2. +9 −26 functions/syndication.php
  3. +1 −1 index.php
View
4 functions.php
@@ -113,10 +113,10 @@ function comicpress_config() {
function comicpress_sidebar_init() {
if (comicpress_themeinfo('enable_caps')) {
$before_widget = "<div id=\"".'%1$s'."\" class=\"widget ".'%2$s'."\">\r\n<div class=\"widget-head\"></div>\r\n<div class=\"widget-content\">\r\n";
- $after_widget = "</div>\r\n<div class=\"widget-foot\"></div>\r\n</div>\r\n";
+ $after_widget = "</div>\r\n<div class=\"clear\"></div>\r\n<div class=\"widget-foot\"></div>\r\n</div>\r\n";
} else {
$before_widget = "<div id=\"".'%1$s'."\" class=\"widget ".'%2$s'."\">\r\n<div class=\"widget-content\">\r\n";
- $after_widget = "</div>\r\n</div>\r\n";
+ $after_widget = "</div>\r\n<div class=\"clear\"></div>\r\n</div>\r\n";
}
foreach (array(
__('Left Sidebar', 'comicpress'),
View
35 functions/syndication.php
@@ -36,26 +36,26 @@ function comicpress_export_wp() {
//Insert the comic image into the RSS feed
if (!function_exists('comicpress_comic_feed')) {
- function comicpress_comic_feed() {
+ function comicpress_comic_feed($content = '') {
global $wp_query, $post, $comiccat;
- $output = '<p>';
+ $content .= '<p>';
if ($wp_query->query_vars['cat'] == $comiccat ) {
- $output .= '<a href="'.get_permalink().'" title="'.comicpress_the_hovertext($post).'">'.comicpress_display_comic_thumbnail('comic',$post,true).'</a>';
+ $content .= '<a href="'.get_permalink().'" title="'.comicpress_the_hovertext($post).'">'.comicpress_display_comic_thumbnail('comic',$post,true).'</a>';
} else {
- $output .= '<a href="'.get_permalink().'" title="'.comicpress_the_hovertext($post).'">'.comicpress_display_comic_thumbnail('rss',$post,true).'</a>';
+ $content .= '<a href="'.get_permalink().'" title="'.comicpress_the_hovertext($post).'">'.comicpress_display_comic_thumbnail('rss',$post,true).'</a>';
}
- $output .= '</p>';
- return apply_filters('comicpress_comic_feed', $output);
+ $content .= '</p>';
+ return apply_filters('comicpress_comic_feed', $content);
}
}
// removed the comicpress_in_comic_category so that if it has a post-image it will add it to the rss feed (else rss comic thumb)
if (!function_exists('comicpress_insert_comic_feed')) {
- function comicpress_insert_comic_feed($content) {
+ function comicpress_insert_comic_feed($content = '') {
global $wp_query, $post;
$category = get_the_category($post->ID);
if (is_feed() && comicpress_in_comic_category($category[0]->cat_ID)) {
- echo comicpress_comic_feed();
+ $content .= comicpress_comic_feed();
}
return apply_filters('comicpress_insert_comic_feed', $content);
}
@@ -64,24 +64,7 @@ function comicpress_insert_comic_feed($content) {
add_filter('the_content','comicpress_insert_comic_feed');
add_filter('the_excerpt','comicpress_insert_comic_feed');
-// Using the_content and the_excerpt instead of the_content_rss cause it doesn't work properly otherwise
-/*
-add_filter('comicpress_comic_feed', 'comicpress_test_feed');
+// Using the_content and the_excerpt instead of the_content_rss cause it doesn't work properly because it places it *out* of the <description>
-function comicpress_test_feed($output) {
- $output .= '<table width="500" style="border: none;" cellpadding="0" cellpadding="0">';
- $output .= '<tr>';
- $output .= '<td style="border: none;"><img src="http://www.zfcomics.com/graphics/footer/top.jpg" alt="" style="width: 500px; height:72px; border: none;" /></td>';
- $output .= '</tr>';
- $output .= '<tr>';
- $output .= '<td><img src="http://www.zfcomics.com/graphics/footer/1.jpg" alt="" style="height:39px; width:25px; border: none;" /><a href="http://www.zfcomics.com"><img src="http://www.zfcomics.com/graphics/footer/read.jpg" alt="" height="39" width="113" padding="0" border="0" /></a><a href="http://www.zfcomics.com/store"><img src="http://www.zfcomics.com/graphics/footer/store.jpg" alt="" width="57" height="39" padding="0" border="0" /></a><a href="http://www.facebook.com/dgriff13"><img src="http://www.zfcomics.com/graphics/footer/fb.jpg" alt="" width="85" height="39" padding="0" border="0" /></a><a href="http://www.twitter.com/dgriff13"><img src="http://www.zfcomics.com/graphics/footer/twitter.jpg" alt="" width="67" height="39"padding="0" border="0" /></a><img src="http://www.zfcomics.com/graphics/footer/2.jpg" alt="" width="61" height="39" padding="0" border="0" /><a href="http://www.facebook.com/dgriff13"><img src="http://www.zfcomics.com/graphics/footer/FBicon.jpg" alt="" width="36" height="39" padding="0" border="0" /></a><a href="http://www.twitter.com/dgriff13"><img src="http://www.zfcomics.com/graphics/footer/twittericon.jpg" alt="" width="37" height="39" padding="0" border="0" /></a><img src="http://www.zfcomics.com/graphics/footer/3.jpg" alt="" style="width: 18px; height:39px; border: none;" /></td>';
- $output .= '</tr>';
- $output .= '<tr>';
- $output .= '<td><img src="http://www.zfcomics.com/graphics/footer/4.jpg" alt="" width="280" height="156" padding="0" border="0" /><a href="http://www.zfcomics.com/store"><img src="http://www.zfcomics.com/graphics/footer/book.jpg" alt="" width="220" height="156" padding="0" border="0" /></a></td>';
- $output .= '</tr>';
- $output .= '</table>';
- return $output;
-}
-*/
?>
View
2 index.php
@@ -1,6 +1,6 @@
<?php
get_header();
-if (!comicpress_themeinfo('disable_comic_frontpage') && !comicpress_themeinfo('disable_comic_blog_frontpage') && !is_paged() ) {
+if (!comicpress_themeinfo('disable_comic_blog_frontpage') && !is_paged() ) {
$wp_query->in_the_loop = true; $comicFrontpage = new WP_Query();
$order = 'DESC';
if (comicpress_themeinfo('display_first_comic_on_home')) $order = 'ASC';

0 comments on commit 7924f6e

Please sign in to comment.
Something went wrong with that request. Please try again.