From 97dcfaca025ffacc290ca7e30d2dc9ac863534ab Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Thu, 8 Sep 2016 18:58:16 -0400
Subject: [PATCH] remove references to of_get_option( 'tag_display' ), which is
 hereby deprecated

---
 home.php                     |  1 -
 options.php                  | 14 --------------
 partials/content-roundup.php |  5 ++---
 partials/content-search.php  |  4 ----
 partials/content.php         |  3 +--
 5 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/home.php b/home.php
index 3d87974a5..fc1b6f203 100644
--- a/home.php
+++ b/home.php
@@ -22,7 +22,6 @@
 $shown_ids = array();
 $home_template = largo_get_active_homepage_layout();
 $layout_class = of_get_option('home_template');
-$tags = of_get_option ('tag_display');
 
 global $largo;
 if ($home_template == 'LegacyThreeColumn')
diff --git a/options.php b/options.php
index dc3fc7754..729784b51 100644
--- a/options.php
+++ b/options.php
@@ -42,12 +42,6 @@ function optionsframework_options() {
 		}
 	}
 
-	$tag_display_options = array(
-		'top' 	=> __('Single Tag Above', 'largo'),
-		'btm' 	=> __('List Below', 'largo'),
-		'none' 	=> __('None', 'largo')
-	);
-
 	$article_utility_buttons = array(
 		'facebook' 	=> __('Facebook', 'largo'),
 		'twitter' 	=> __('Twitter', 'largo'),
@@ -380,14 +374,6 @@ function optionsframework_options() {
 		'name' 	=> __('Other Homepage Display Options', 'largo'),
 		'type' 	=> 'info');
 
-	$options[] = array(
-		'desc' 		=> __('<strong>How would you like to display categories and tags for posts on the homepage?</strong> Largo can display a single category or tag above the headline for each story, a list of tags below the story\'s excerpt or nothing at all.', 'largo'),
-		'id' 		=> 'tag_display',
-		'std' 		=> 'top',
-		'type' 		=> 'select',
-		'class'		=> 'mini',
-		'options' 	=> $tag_display_options);
-
 	$options[] = array(
 		'desc' 	=> __('<strong>Number of posts</strong> to display in the main loop on the homepage', 'largo'),
 		'id' 	=> 'num_posts_home',
diff --git a/partials/content-roundup.php b/partials/content-roundup.php
index 365504b6a..96b959a00 100644
--- a/partials/content-roundup.php
+++ b/partials/content-roundup.php
@@ -7,7 +7,6 @@
  * @link https://github.com/INN/link-roundups
  * @link https://wordpress.org/plugins/link-roundups/
  */
-$tags = of_get_option( 'tag_display' );
 $hero_class = largo_hero_class( $post->ID, FALSE );
 $values = get_post_custom( $post->ID );
 $featured = has_term( 'homepage-featured', 'prominence' );
@@ -19,8 +18,8 @@
 		$entry_classes = 'entry-content';
 		echo '<div class="' . $entry_classes . '">';
 
-		if ( largo_has_categories_or_tags() && $tags === 'top' ) {
-		 	echo '<h5 class="top-tag">' . largo_top_term( $args = array( 'echo' => FALSE ) ) . '</h5>';
+		if ( largo_has_categories_or_tags() ) {
+			echo '<h5 class="top-tag">' . largo_top_term( $args = array( 'echo' => FALSE ) ) . '</h5>';
 		}
 	?>
 
diff --git a/partials/content-search.php b/partials/content-search.php
index ccab846f8..408a5328c 100644
--- a/partials/content-search.php
+++ b/partials/content-search.php
@@ -4,7 +4,6 @@
  *
  * @package Largo
  */
-$tags = of_get_option( 'tag_display' );
 $values = get_post_custom( $post->ID );
 $entry_classes = 'entry-content';
 ?>
@@ -18,9 +17,6 @@
 
 		<?php largo_excerpt( $post, 1, null, null, true, false ); ?>
 
-		<?php if ( !is_home() && largo_has_categories_or_tags() && $tags === 'btm' ) { ?>
-			<h5 class="tag-list"><strong><?php _e('More about:', 'largo'); ?></strong> <?php largo_categories_and_tags( 8 ); ?></h5>
-		<?php } ?>
 		<small class="date-link">
 			<span class="date"><?php largo_time(); ?></span>
 			<span class="sep">|</span>
diff --git a/partials/content.php b/partials/content.php
index 54c46bbc4..8cad9ef5c 100644
--- a/partials/content.php
+++ b/partials/content.php
@@ -4,7 +4,6 @@
  *
  * @package Largo
  */
-$tags = of_get_option( 'tag_display' );
 $hero_class = largo_hero_class( $post->ID, FALSE );
 $values = get_post_custom( $post->ID );
 $featured = has_term( 'homepage-featured', 'prominence' );
@@ -20,7 +19,7 @@
 // series-specific options
 if ( largo_post_in_series() ) {
 	$in_series = TRUE;
-	if ( ! isset( $opt['show']['tags'] ) &&  ! $opt['show']['tags'] && ! largo_has_categories_or_tags() ) {
+	if ( ! largo_has_categories_or_tags() ) {
 		$show_top_tag = FALSE;
 	}
 	if ( ! isset( $opt['show']['image'] ) && ! $opt['show']['image'] ) {