From 16582f84a4d5353bcc66a8cce8e8217fdf225be6 Mon Sep 17 00:00:00 2001
From: David Shanske <david@shanske.com>
Date: Sat, 12 Jan 2019 17:26:12 -0600
Subject: [PATCH] Fix issue with Micropub and bump version

---
 includes/class-kind-plugins.php |  3 +++
 indieweb-post-kinds.php         | 18 +++++++++---------
 languages/post_kinds.pot        |  4 ++--
 readme.md                       |  7 +++++--
 readme.txt                      |  7 +++++--
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/includes/class-kind-plugins.php b/includes/class-kind-plugins.php
index d60e08f..d68fcab 100755
--- a/includes/class-kind-plugins.php
+++ b/includes/class-kind-plugins.php
@@ -99,6 +99,9 @@ public static function micropub_parse( $input ) {
 		if ( ! isset( $input['properties'] ) ) {
 			return $input;
 		}
+		if ( ! class_exists( 'Parse-This' ) ) {
+			require_once plugin_dir_path( __FILE__ ) . 'parse-this/includes/class-parse-this.php';
+		}
 		$parsed = array( 'bookmark-of', 'like-of', 'favorite-of', 'in-reply-to', 'read-of', 'listen-of', 'watch-of' );
 		foreach ( $input['properties'] as $property => $value ) {
 			if ( in_array( $property, $parsed, true ) ) {
diff --git a/indieweb-post-kinds.php b/indieweb-post-kinds.php
index e5c4554..d844947 100755
--- 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.1.7
+ * Version: 3.1.8
  * Author: David Shanske
  * Author URI: https://david.shanske.com
  * Text Domain: indieweb-post-kinds
@@ -28,7 +28,7 @@
 add_action( 'init', array( 'Post_Kinds_Plugin', 'init' ) );
 
 class Post_Kinds_Plugin {
-	public static $version = '3.1.7';
+	public static $version = '3.1.8';
 	public static function init() {
 		// Add Kind Taxonomy.
 		require_once plugin_dir_path( __FILE__ ) . 'includes/class-post-kind.php';
@@ -53,6 +53,13 @@ public static function plugins_loaded() {
 		// Add Time Global Functions.
 		require_once plugin_dir_path( __FILE__ ) . '/includes/time-functions.php';
 
+		if ( ! class_exists( 'MF2_Post' ) ) {
+			require_once plugin_dir_path( __FILE__ ) . 'includes/parse-this/includes/class-mf2-post.php';
+		}
+
+		// Parse This
+		require_once plugin_dir_path( __FILE__ ) . 'includes/parse-this/parse-this.php';
+
 		// Plugin Specific Kind Customizations
 		require_once plugin_dir_path( __FILE__ ) . '/includes/class-kind-plugins.php';
 		add_action( 'init', array( 'Kind_Plugins', 'init' ) );
@@ -78,13 +85,6 @@ public static function plugins_loaded() {
 		require_once plugin_dir_path( __FILE__ ) . 'includes/class-kind-view.php';
 		add_action( 'init', array( 'Kind_View', 'init' ) );
 
-		// Parse This
-		require_once plugin_dir_path( __FILE__ ) . 'includes/parse-this/parse-this.php';
-
-		if ( ! class_exists( 'MF2_Post' ) ) {
-			require_once plugin_dir_path( __FILE__ ) . 'includes/parse-this/includes/class-mf2-post.php';
-		}
-		
 		// Kind Widgets
 		require_once plugin_dir_path( __FILE__ ) . 'includes/class-kind-menu-widget.php';
 		require_once plugin_dir_path( __FILE__ ) . 'includes/class-kind-post-widget.php';
diff --git a/languages/post_kinds.pot b/languages/post_kinds.pot
index f7e6cf0..a1fa77f 100644
--- a/languages/post_kinds.pot
+++ b/languages/post_kinds.pot
@@ -2,10 +2,10 @@
 # This file is distributed under the same license as the Post Kinds package.
 msgid ""
 msgstr ""
-"Project-Id-Version: Post Kinds 3.1.7\n"
+"Project-Id-Version: Post Kinds 3.1.8\n"
 "Report-Msgid-Bugs-To: "
 "http://wordpress.org/support/plugin/indieweb-post-kinds\n"
-"POT-Creation-Date: 2019-01-05 19:01:05+00:00\n"
+"POT-Creation-Date: 2019-01-12 23:25:25+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/readme.md b/readme.md
index 48a2edd..6983897 100644
--- a/readme.md
+++ b/readme.md
@@ -1,10 +1,10 @@
 # Post Kinds #
 **Contributors:** dshanske  
 **Tags:** indieweb, interaction, posts, webmention, share, like, scrobble  
-**Stable tag:** 3.1.7  
+**Stable tag:** 3.1.8  
 **Requires at least:** 4.9.6  
 **Requires PHP:** 5.4  
-**Tested up to:** 5.0.2  
+**Tested up to:** 5.0.3  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -259,6 +259,9 @@ through future plugin updates.
 
 ## Changelog ##
 
+### 3.1.8 ( 2019-01-12 ) ###
+* Fix issue with Micropub posting caused by this plugin
+
 ### 3.1.7 ( 2019-01-05 ) ###
 * Fix issue with new tag rewrite overwriting feed by changing tag kind archive to /kind/????/tag/????? 
 
diff --git a/readme.txt b/readme.txt
index 48a6e36..93f1fe4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,10 +1,10 @@
 === Post Kinds ===
 Contributors: dshanske
 Tags: indieweb, interaction, posts, webmention, share, like, scrobble
-Stable tag: 3.1.7
+Stable tag: 3.1.8
 Requires at least: 4.9.6
 Requires PHP: 5.4
-Tested up to: 5.0.2
+Tested up to: 5.0.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -255,6 +255,9 @@ through future plugin updates.
 
 == Changelog ==
 
+= 3.1.8 ( 2019-01-12 ) =
+* Fix issue with Micropub posting caused by this plugin
+
 = 3.1.7 ( 2019-01-05 ) =
 * Fix issue with new tag rewrite overwriting feed by changing tag kind archive to /kind/????/tag/?????