From 1dce91242ee51f1da22f037f74808f08b2b10b61 Mon Sep 17 00:00:00 2001
From: Michael Beckwith <tw2113@gmail.com>
Date: Mon, 19 Apr 2021 20:33:00 -0500
Subject: [PATCH] merge in version 1.9.1

---
 custom-post-type-ui.php |  6 +++---
 inc/post-types.php      |  2 +-
 inc/tools.php           | 33 +++++++++++++++++++++++++++------
 readme.txt              | 10 +++++++++-
 4 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/custom-post-type-ui.php b/custom-post-type-ui.php
index 5b07c069..0f8f3587 100644
--- a/custom-post-type-ui.php
+++ b/custom-post-type-ui.php
@@ -16,7 +16,7 @@
  * Plugin URI: https://github.com/WebDevStudios/custom-post-type-ui/
  * Description: Admin panel for creating custom post types and custom taxonomies in WordPress
  * Author: WebDevStudios
- * Version: 1.9.0
+ * Version: 1.9.1
  * Author URI: https://webdevstudios.com/
  * Text Domain: custom-post-type-ui
  * Domain Path: /languages
@@ -30,8 +30,8 @@
 	exit;
 }
 
-define( 'CPT_VERSION', '1.9.0' ); // Left for legacy purposes.
-define( 'CPTUI_VERSION', '1.9.0' );
+define( 'CPT_VERSION', '1.9.1' ); // Left for legacy purposes.
+define( 'CPTUI_VERSION', '1.9.1' );
 define( 'CPTUI_WP_VERSION', get_bloginfo( 'version' ) );
 
 /**
diff --git a/inc/post-types.php b/inc/post-types.php
index 61b633cd..37cd8eb8 100644
--- a/inc/post-types.php
+++ b/inc/post-types.php
@@ -990,7 +990,7 @@ function cptui_manage_post_types() {
 								'namearray'  => 'cpt_custom_post_type',
 								'name'       => 'hierarchical',
 								'labeltext'  => esc_html__( 'Hierarchical', 'custom-post-type-ui' ),
-								'aftertext'  => esc_html__( '(default: false) Whether or not the post type can have parent-child relationships.', 'custom-post-type-ui' ),
+								'aftertext'  => esc_html__( '(default: false) Whether or not the post type can have parent-child relationships. At least one published content item is needed in order to select a parent.', 'custom-post-type-ui' ),
 								'selections' => $select,
 							] );
 
diff --git a/inc/tools.php b/inc/tools.php
index b260ea40..50b89464 100644
--- a/inc/tools.php
+++ b/inc/tools.php
@@ -326,6 +326,10 @@ function cptui_get_single_taxonomy_registery( $taxonomy = [] ) {
 ?>
 	];
 
+	<?php
+	$show_graphql = isset( $taxonomy['show_in_graphql'] ) ? (bool) $taxonomy['show_in_graphql'] : false;
+	?>
+
 	$args = [
 		"label" => __( "<?php echo $taxonomy['label']; ?>", "<?php echo $textdomain; ?>" ),
 		"labels" => $labels,
@@ -342,12 +346,19 @@ function cptui_get_single_taxonomy_registery( $taxonomy = [] ) {
 		"rest_base" => "<?php echo $rest_base; ?>",
 		"rest_controller_class" => "<?php echo $rest_controller_class; ?>",
 		"show_in_quick_edit" => <?php echo $show_in_quick_edit; ?>,
-	<?php if ( ! empty( $meta_box_cb ) ) { ?>
-	"meta_box_cb" => <?php echo $meta_box_cb; ?>,
-	<?php } ?>
-	<?php if ( ! empty( $default_term ) ) { ?>
-	"default_term" => <?php echo $default_term; ?>,
-	<?php } ?>
+<?php if ( $show_graphql ) : ?>
+		"show_in_graphql" => <?php echo disp_boolean( $taxonomy['show_in_graphql'] ); ?>,
+		"graphql_single_name" => "<?php echo esc_html( $taxonomy['graphql_single_name'] ); ?>",
+		"show_in_graphql" => "<?php echo esc_html( $taxonomy['graphql_plural_name'] ); ?>",
+<?php else: ?>
+		"show_in_graphql" => <?php echo disp_boolean( false ); ?>,
+<?php endif; ?>
+<?php if ( ! empty( $meta_box_cb ) ) { ?>
+		"meta_box_cb" => <?php echo $meta_box_cb; ?>,
+<?php } ?>
+<?php if ( ! empty( $default_term ) ) { ?>
+		"default_term" => <?php echo $default_term; ?>,
+<?php } ?>
 	];
 	register_taxonomy( "<?php echo esc_html( $taxonomy['name'] ); ?>", <?php echo $post_types; ?>, $args );
 <?php
@@ -420,6 +431,9 @@ function cptui_get_single_post_type_registery( $post_type = [] ) {
 		}
 	}
 
+
+	$show_graphql = isset( $post_type['show_in_graphql'] ) ? (bool) $post_type['show_in_graphql'] : false;
+
 	$rewrite_withfront = '';
 	$rewrite           = get_disp_boolean( $post_type['rewrite'] );
 	if ( false !== $rewrite ) {
@@ -579,6 +593,13 @@ function cptui_get_single_post_type_registery( $post_type = [] ) {
 <?php if ( true === $yarpp ) { ?>
 		"yarpp_support" => <?php echo disp_boolean( $yarpp ); ?>,
 <?php } ?>
+<?php if ( $show_graphql ) : ?>
+		"show_in_graphql" => <?php echo disp_boolean( $post_type['show_in_graphql'] ); ?>,
+		"graphql_single_name" => "<?php echo esc_html( $post_type['graphql_single_name'] ); ?>",
+		"show_in_graphql" => "<?php echo esc_html( $post_type['graphql_plural_name'] ); ?>",
+<?php else: ?>
+		"show_in_graphql" => <?php echo disp_boolean( false ); ?>,
+<?php endif; ?>
 	];
 
 	register_post_type( "<?php echo esc_html( $post_type['name'] ); ?>", $args );
diff --git a/readme.txt b/readme.txt
index d4dfe9f4..c3fec4a0 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tags: custom post types, CPT, CMS, post, types, post type, taxonomy, tax, custom, content types, post types
 Requires at least: 5.5
 Tested up to: 5.7.0
-Stable tag: 1.9.0
+Stable tag: 1.9.1
 License: GPL-2.0+
 Requires PHP: 5.6
 
@@ -31,6 +31,10 @@ Official development of Custom Post Type UI is on GitHub, with official stable r
 
 == Changelog ==
 
+= 1.9.1 - 2021-04-19 =
+* Fixed: missed WPGraphQL settings in our Get Tools/Export functionality.
+* Updated: note about needing a published item to set parent/child relationships in post types.
+
 = 1.9.0 - 2021-03-30 =
 * Added: WPGraphQL Support when WPGraphQL is installed and active.
 * Fixed: Better handling of code in post_format based helper functions.
@@ -54,6 +58,10 @@ Official development of Custom Post Type UI is on GitHub, with official stable r
 
 == Upgrade Notice ==
 
+= 1.9.1 - 2021-04-19 =
+* Fixed: missed WPGraphQL settings in our Get Tools/Export functionality.
+* Updated: note about needing a published item to set parent/child relationships in post types.
+
 = 1.9.0 - 2021-03-30 =
 * Added: WPGraphQL Support when WPGraphQL is installed and active.
 * Fixed: Better handling of code in post_format based helper functions.