From bb02311dd7f0e46dc4aa39e8c100ead9a26dc65c Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Sat, 12 Nov 2016 15:43:24 -0500
Subject: [PATCH] Fix Edit Flow conflict

Adds a filter to taxonomies which can support featured images. Also adds
the function to remove Edit Flow's post status from this list.
---
 ...displayfeaturedimagegenesis-taxonomies.php | 21 ++++++++++++++-----
 .../class-displayfeaturedimagegenesis.php     |  1 +
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/includes/class-displayfeaturedimagegenesis-taxonomies.php b/includes/class-displayfeaturedimagegenesis-taxonomies.php
index 34121e3..0067afe 100644
--- a/includes/class-displayfeaturedimagegenesis-taxonomies.php
+++ b/includes/class-displayfeaturedimagegenesis-taxonomies.php
@@ -28,6 +28,7 @@ class Display_Featured_Image_Genesis_Taxonomies extends Display_Featured_Image_G
 		);
 		$output     = 'names';
 		$taxonomies = get_taxonomies( $args, $output );
+		$taxonomies = apply_filters( 'displayfeaturedimagegenesis_get_taxonomies', $taxonomies );
 		foreach ( $taxonomies as $taxonomy ) {
 			add_action( "{$taxonomy}_add_form_fields", array( $this, 'add_taxonomy_meta_fields' ), 5, 2 );
 			add_action( "{$taxonomy}_edit_form_fields", array( $this, 'edit_taxonomy_meta_fields' ), 5, 2 );
@@ -41,6 +42,17 @@ class Display_Featured_Image_Genesis_Taxonomies extends Display_Featured_Image_G
 
 	}
 
+	/**
+	 * Remove Edit Flow's post statuses from the allowed taxonomies.
+	 * @param $taxonomies
+	 *
+	 * @return mixed
+	 */
+	public function remove_post_status_terms( $taxonomies ) {
+		unset( $taxonomies['post_status'] );
+		return $taxonomies;
+	}
+
 	/**
 	 * add featured image uploader to new term add
 	 */
@@ -92,8 +104,7 @@ class Display_Featured_Image_Genesis_Taxonomies extends Display_Featured_Image_G
 
 	/**
 	 * Save extra taxonomy fields callback function.
-	 * @param  term id $term_id the id of the term
-	 * @return updated option          updated option for term featured image
+	 * @param $term_id int the id of the term
 	 *
 	 * @since 2.0.0
 	 */
@@ -104,6 +115,9 @@ class Display_Featured_Image_Genesis_Taxonomies extends Display_Featured_Image_G
 		}
 		$input          = $_POST['displayfeaturedimagegenesis'];
 		$displaysetting = get_option( "displayfeaturedimagegenesis_$term_id", false );
+		if ( ! $displaysetting ) {
+			return;
+		}
 		$action         = function_exists( 'get_term_meta' ) ? 'update_term_meta' : 'update_options_meta';
 		$this->$action( $term_id, $input, $displaysetting );
 	}
@@ -112,7 +126,6 @@ class Display_Featured_Image_Genesis_Taxonomies extends Display_Featured_Image_G
 	 * update/delete term meta
 	 * @param  int $term_id        term id
 	 * @param  array $displaysetting old option, if it exists
-	 * @return term_meta
 	 *
 	 * @since 2.4.0
 	 */
@@ -139,7 +152,6 @@ class Display_Featured_Image_Genesis_Taxonomies extends Display_Featured_Image_G
 	 * update term option (for sites running WP below 4.4)
 	 * @param  int $term_id        term id
 	 * @param  array $displaysetting previous option, if it exists
-	 * @return array                 updated option
 	 *
 	 * @since 2.4.0
 	 */
@@ -192,7 +204,6 @@ class Display_Featured_Image_Genesis_Taxonomies extends Display_Featured_Image_G
 
 	/**
 	 * Help tab for media screen
-	 * @return help tab with verbose information for plugin
 	 *
 	 * @since 2.0.0
 	 */
diff --git a/includes/class-displayfeaturedimagegenesis.php b/includes/class-displayfeaturedimagegenesis.php
index c4f9201..fe32a88 100644
--- a/includes/class-displayfeaturedimagegenesis.php
+++ b/includes/class-displayfeaturedimagegenesis.php
@@ -131,6 +131,7 @@ class Display_Featured_Image_Genesis {
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
 
 		// Taxonomies, Author, Post Meta
+		add_filter( 'displayfeaturedimagegenesis_get_taxonomies', array( $this->taxonomies, 'remove_post_status_terms' ) );
 		add_action( 'admin_init', array( $this->taxonomies, 'set_taxonomy_meta' ) );
 		add_action( 'admin_init', array( $this->author, 'set_author_meta' ) );
 		add_filter( 'admin_post_thumbnail_html', array( $this->post_meta, 'meta_box' ), 10, 2 );