From 92d15eee2a358d2efceec1f32895326f227a21b1 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Wed, 2 Mar 2016 21:44:01 -0500
Subject: [PATCH] Update term meta retrieval method

Necessary for G 2.2.7. This maintains backwards compatibility for users
running earlier WP/G versions.
---
 ...ass-displayfeaturedimagegenesis-common.php |  4 ++--
 ...isplayfeaturedimagegenesis-description.php |  5 ++--
 includes/helper-functions.php                 | 24 +++++++++++++++++++
 ...ayfeaturedimagegenesis-taxonomy-widget.php |  5 ++--
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/includes/class-displayfeaturedimagegenesis-common.php b/includes/class-displayfeaturedimagegenesis-common.php
index b3b9b68..ee80f4f 100644
--- a/includes/class-displayfeaturedimagegenesis-common.php
+++ b/includes/class-displayfeaturedimagegenesis-common.php
@@ -190,10 +190,10 @@ class Display_Featured_Image_Genesis_Common {
 			$title = get_post( $postspage )->post_title;
 		} elseif ( is_category() || is_tag() || is_tax() ) {
 			$term = is_tax() ? get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ) : get_queried_object();
-			if ( ! $term || ! isset( $term->meta ) ) {
+			if ( ! $term ) {
 				return;
 			}
-			$title = $term->meta['headline'];
+			$title = displayfeaturedimagegenesis_get_term_meta( $term, 'headline' );
 			if ( empty( $title ) && $a11ycheck ) {
 				$title = $term->name;
 			}
diff --git a/includes/class-displayfeaturedimagegenesis-description.php b/includes/class-displayfeaturedimagegenesis-description.php
index cae162f..dcdaf6a 100644
--- a/includes/class-displayfeaturedimagegenesis-description.php
+++ b/includes/class-displayfeaturedimagegenesis-description.php
@@ -104,11 +104,12 @@ class Display_Featured_Image_Genesis_Description {
 
 		$term = is_tax() ? get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) ) : $wp_query->get_queried_object();
 
-		if ( ! $term || ! isset( $term->meta ) ) {
+		if ( ! $term ) {
 			return;
 		}
 
-		$intro_text = apply_filters( 'display_featured_image_genesis_term_description', $term->meta['intro_text'] );
+		$intro_text = displayfeaturedimagegenesis_get_term_meta( $term, 'intro_text' );
+		$intro_text = apply_filters( 'display_featured_image_genesis_term_description', $intro_text );
 
 		if ( $intro_text ) {
 			$class = 'archive-description taxonomy-description';
diff --git a/includes/helper-functions.php b/includes/helper-functions.php
index 8e9394d..1a64e93 100644
--- a/includes/helper-functions.php
+++ b/includes/helper-functions.php
@@ -225,3 +225,27 @@ function displayfeaturedimagegenesis_check_image_id( $image_id = '' ) {
 function displayfeaturedimagegenesis_get_setting() {
 	return apply_filters( 'displayfeaturedimagegenesis_get_setting', false );
 }
+
+/**
+ * Get the term meta (generally headline or intro text). Backwards compatible,
+ * but uses new term meta (as of Genesis 2.2.7)
+ * @param $term object the term
+ * @param $key string meta key to retrieve
+ * @param string $value string output of the term meta
+ *
+ * @return mixed|string
+ *
+ * @ since 2.5.0
+ */
+function displayfeaturedimagegenesis_get_term_meta( $term, $key, $value = '' ) {
+	if ( ! $term ) {
+		return $value;
+	}
+	if ( function_exists( 'get_term_meta' ) ) {
+		$value = get_term_meta( $term->term_id, $key, true );
+	}
+	if ( ! $value && isset( $term->meta[ $key ] ) ) {
+		$value = $term->meta[ $key ];
+	}
+	return $value;
+}
diff --git a/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php b/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
index 0d63253..6ccf985 100644
--- a/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
+++ b/includes/widgets/displayfeaturedimagegenesis-taxonomy-widget.php
@@ -82,7 +82,7 @@ class Display_Featured_Image_Genesis_Widget_Taxonomy extends WP_Widget {
 			return;
 		}
 
-		$title = $term->meta['headline'];
+		$title = displayfeaturedimagegenesis_get_term_meta( $term, 'headline' );
 		if ( ! $title ) {
 			$title = $term->name;
 		}
@@ -125,7 +125,8 @@ class Display_Featured_Image_Genesis_Widget_Taxonomy extends WP_Widget {
 
 			echo genesis_html5() ? '<div class="term-description">' : '';
 
-			$intro_text = apply_filters( 'display_featured_image_genesis_term_description', $term->meta['intro_text'] );
+			$intro_text = displayfeaturedimagegenesis_get_term_meta( $term, 'intro_text' );
+			$intro_text = apply_filters( 'display_featured_image_genesis_term_description', $intro_text );
 			if ( ! $intro_text ) {
 				$intro_text = $term->description;
 			}