Bump version

dshanske · Jun 20, 2022 · fbd8bdd · fbd8bdd
1 parent 27bc6f2
commit fbd8bdd
Show file tree

Hide file tree

Showing 6 changed files with 178 additions and 121 deletions.
diff --git a/includes/class-kind-config.php b/includes/class-kind-config.php
@@ -49,10 +49,10 @@ public static function init() {
 			'type'         => 'array',
 			'description'  => 'Kinds Showing in Main Archive',
 			'show_in_rest' => false,
-			'default'      => array()
+			'default'      => array(),
 		);
 		register_setting( 'iwt_options', 'kind_firehose', $args );
-		
+
 		$args = array(
 			'type'         => 'boolean',
 			'description'  => 'Response Information Should Be After Content',

diff --git a/includes/class-kind-taxonomy.php b/includes/class-kind-taxonomy.php
@@ -221,7 +221,7 @@ public static function kind_filter_query( $query ) {
 	public static function kind_firehose_query( $query ) {
 
 		// check if the user is requesting an admin page
-		 if ( is_admin() || ! $query->is_main_query() ) {
+		if ( is_admin() || ! $query->is_main_query() ) {
 			return $query;
 		}
 
@@ -237,7 +237,6 @@ public static function kind_firehose_query( $query ) {
 			return $query;
 		}
 
-
 		if ( $query->is_archive() ) {
 			return $query;
 		}
@@ -579,7 +578,7 @@ public static function register() {
 		add_rewrite_tag( '%kind_exclude_terms%', '([a-z,]+)', 'exclude_terms=' );
 		add_permastruct( 'kind_excludes', $kind_exclude_slug . '/%kind_exclude%/%kind_exclude_terms%' );
 
-		$kind_photos_slug = apply_filters( 'kind_photos_slug', 'photos' );
+		$kind_photos_slug   = apply_filters( 'kind_photos_slug', 'photos' );
 		$kind_firehose_slug = apply_filters( 'kind_firehose_slug', 'firehose' );
 
 		$year_regex       = '([0-9]{4})';
@@ -862,7 +861,7 @@ public static function kind_archive_title( $title, $original_title = null, $pref
 				/* translators: 1. Taxonomy . 1: Date */
 				$title = sprintf( __( '%1$1s - %2$2s', 'indieweb-post-kinds' ), $title, get_the_date( _x( 'F j, Y', 'daily archives date format', 'indieweb-post-kinds' ) ) );
 			}
-		} else if ( get_query_var( 'kind_firehose' ) ) {
+		} elseif ( get_query_var( 'kind_firehose' ) ) {
 			$title = sprintf( __( '%1$s - %2$2s', 'indieweb-post-kinds' ), $title, __( 'Firehose', 'indieweb-post-kinds' ) );
 		}
 

diff --git a/indieweb-post-kinds.php b/indieweb-post-kinds.php
@@ -7,7 +7,7 @@
  * Plugin Name: Post Kinds
  * Plugin URI: https://wordpress.org/plugins/indieweb-post-kinds/
  * Description: Ever want to reply to someone else's post with a post on your own site? Or to "like" someone else's post, but with your own site?
- * Version: 3.5.12
+ * Version: 3.6.0
  * Author: David Shanske
  * Author URI: https://david.shanske.com
  * Text Domain: indieweb-post-kinds
@@ -68,7 +68,7 @@ public static function parse_this_error() {
 
 	public static function show_editor_error() {
 		// Do not show this error in ClassicPress
-		if ( function_exists( 'classicpress_version' ) ) {
+		if ( self::is_classicpress() ) {
 			return false;
 		}
 		// Do not show if less than Version 5
@@ -81,6 +81,10 @@ public static function show_editor_error() {
 		return true;
 	}
 
+	public static function is_classicpress() {
+		return function_exists( 'classicpress_version' );
+	}
+
 	public static function classic_editor_error() {
 		if ( ! self::post_uses_gutenberg() ) {
 			return '';