Moved social icons output outside the the_content filter

GavickPro · Aug 7, 2015 · 6bc09d2 · 6bc09d2
1 parent ddb17c2
commit 6bc09d2
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 4 deletions.
diff --git a/content-archive.php b/content-archive.php
@@ -32,7 +32,7 @@
 $post_helper_css_classes .= get_theme_mod('portfolio_frontpage_animation_speed', '500') !== ''  ? $animation_speed : '';
 $post_helper_css_classes .= (get_theme_mod('portfolio_show_excerpts', '1') == '0' && is_sticky()) ? ' sticky' : '';
 
-$post_preview_animation = get_theme_mod('portfolio_post_preview_animation', 'animation-slide-up');
+$post_preview_animation = get_theme_mod('portfolio_post_preview_animation', 'slide-up');
 
 ?>
 
@@ -91,6 +91,8 @@
 		<?php else : ?>
 		<div class="entry-content">
 			<?php the_content(__('Read more', 'portfolio')); ?>
+			<?php echo portfolio_social_button(); ?>
+
 			<?php wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">' . __('Pages:', 'portfolio') . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>')); ?>
 
 			<?php

diff --git a/content-gallery.php b/content-gallery.php
@@ -19,6 +19,8 @@
 		<?php else : ?>
 		<div class="entry-content">
 			<?php the_content(__('Read more', 'portfolio')); ?>
+			<?php echo portfolio_social_button(); ?>
+
 			<?php wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">' . __('Pages:', 'portfolio') . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>')); ?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>

diff --git a/content-image.php b/content-image.php
@@ -19,6 +19,8 @@
 		<?php else : ?>
 		<div class="entry-content">
 			<?php the_content(__('Read more', 'portfolio')); ?>
+			<?php echo portfolio_social_button(); ?>
+
 			<?php wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">' . __('Pages:', 'portfolio') . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>

diff --git a/content-link.php b/content-link.php
@@ -13,6 +13,8 @@
 
 		<div class="entry-content">
 			<?php the_content(__('Read more', 'portfolio')); ?>
+			<?php echo portfolio_social_button(); ?>
+
 			<?php wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">' . __('Pages:', 'portfolio') . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>')); ?>
 		</div><!-- .entry-content -->
 	</div>

diff --git a/content-quote.php b/content-quote.php
@@ -13,6 +13,8 @@
 
 		<div class="entry-content">
 			<?php the_content(__('Read more', 'portfolio')); ?>
+			<?php echo portfolio_social_button(); ?>
+
 			<?php wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">' . __('Pages:', 'portfolio') . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>')); ?>
 		</div><!-- .entry-content -->
 	</div>

diff --git a/content-video.php b/content-video.php
@@ -24,8 +24,10 @@
 		<div class="entry-content">
 			<?php if($video_code != '') : ?>
 				<?php echo str_replace($video_code, '', apply_filters('the_content', get_the_content( __( 'Read more', 'portfolio' ) ))); ?>
+				<?php echo portfolio_social_button(); ?>
 			<?php else : ?>
 				<?php the_content(__('Read more', 'portfolio')); ?>
+				<?php echo portfolio_social_button(); ?>
 			<?php endif; ?>	
 
 			<?php wp_link_pages( array( 'before' => '<div class="page-links"><span class="page-links-title">' . __('Pages:', 'portfolio') . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>' ) ); ?>

diff --git a/content.php b/content.php
@@ -20,7 +20,10 @@
 		<?php else : ?>
 		<div class="entry-content">
 			<?php the_content(__('Read more', 'portfolio')); ?>
+			<?php echo portfolio_social_button(); ?>
+
 			<?php wp_link_pages(array('before' => '<div class="page-links"><span class="page-links-title">' . __('Pages:', 'portfolio') . '</span>', 'after' => '</div>', 'link_before' => '<span>', 'link_after' => '</span>')); ?>
+
 			<?php
 				if(get_theme_mod('portfolio_post_show_tags', '1') == '1') {
 					$tag_list = get_the_tag_list('<ul class="tags-links"><li>',', </li><li>','</li></ul>');

diff --git a/functions.php b/functions.php
@@ -388,14 +388,15 @@ function portfolio_the_attached_image() {
 	 * @param string $content Post content.
 	 * @return string Post content with HTML output.
 	 */
-	function portfolio_social_button($content) {
+	function portfolio_social_button() {
 		global $post;
 		// get posts titles and permalinks
 		$permalink = get_permalink($post->ID);
 		$title = get_the_title();
+		$content = '';
 		// add share button only on posts pages
 		if(!is_feed() && !is_home() && !is_page() && get_theme_mod('portfolio_post_show_social', '1') == '1') {
-			$content = $content . '<div class="gk-social-buttons">
+			$content = '<div class="gk-social-buttons">
 			<span class="gk-social-label">'.__( 'Share:', 'portfolio' ).'</span>
 			<a class="gk-social-twitter" href="http://twitter.com/share?text='.urlencode($title).'&amp;url='.urlencode($permalink).'"
 	            onclick="window.open(this.href, \'twitter-share\', \'width=550,height=235\');return false;">
@@ -417,7 +418,7 @@ function portfolio_social_button($content) {
 	}
 }
 
-add_filter('the_content', 'portfolio_social_button');
+//add_filter('the_content', 'portfolio_social_button');
 
 
 if(get_theme_mod('portfolio_special_img_size', '0') == '1') {