Merge pull request #205 from pfefferle/julfixes

Julfixes

Author: pfefferle

composer.json

@@ -20,9 +20,9 @@
     "phpunit/phpunit": "5.5.*",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
     "squizlabs/php_codesniffer": "^3.4",
-    "phpcompatibility/php-compatibility": "^9.1",
+    "phpcompatibility/php-compatibility": "^9.2",
     "wp-coding-standards/wpcs": "^2.0",
-    "phpcompatibility/phpcompatibility-wp": "^2.0"
+    "phpcompatibility/phpcompatibility-wp": "^2.0.0"
   },
   "scripts": {
     "test": [
@@ -32,7 +32,7 @@
     ],
     "lint": "phpcs",
     "install-codestandards": [
-	"Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run"
+      "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run"
     ]
   }
 }

includes/class-webmention-admin.php

@@ -23,8 +23,6 @@ public static function init() {
 		add_filter( 'manage_edit-comments_columns', array( 'Webmention_Admin', 'comment_columns' ) );
 		add_filter( 'manage_comments_custom_column', array( 'Webmention_Admin', 'manage_comments_custom_column' ), 10, 2 );
 
-		// Webmention whitelist
-		add_filter( 'webmention_comment_data', array( 'Webmention_Admin', 'auto_approve' ), 13, 1 );
 		add_filter( 'comment_row_actions', array( 'Webmention_Admin', 'comment_row_actions' ), 13, 2 );
 		add_filter( 'comment_unapproved_to_approved', array( 'Webmention_Admin', 'transition_to_whitelist' ), 10 );
 

includes/class-webmention-receiver.php

@@ -33,6 +33,8 @@ public static function init() {
 		add_filter( 'webmention_comment_data', array( 'Webmention_Receiver', 'default_title_filter' ), 21, 1 );
 		add_filter( 'webmention_comment_data', array( 'Webmention_Receiver', 'default_content_filter' ), 22, 1 );
 
+		add_filter( 'webmention_comment_data', array( 'Webmention_Receiver', 'auto_approve', 13, 1 ) );
+
 		// Allow for avatars on webmention comment types
 		if ( 0 !== (int) get_option( 'webmention_avatars', 1 ) ) {
 			add_filter( 'get_avatar_comment_types', array( 'Webmention_Receiver', 'get_avatar_comment_types' ), 99 );
@@ -730,18 +732,6 @@ public static function default_content_filter( $commentdata ) {
 		return $commentdata;
 	}
 
-	/**
-	 * Marks the post as "no webmentions sent yet"
-	 *
-	 * @param int $post_id
-	 */
-	public static function publish_post_hook( $post_id ) {
-		// check if pingbacks are enabled
-		if ( get_option( 'default_pingback_flag' ) ) {
-			add_post_meta( $post_id, '_mentionme', '1', true );
-		}
-	}
-
 	/**
 	 * Delete comment if source returns error 410 or 452
 	 *

includes/class-webmention-sender.php

@@ -35,10 +35,7 @@ public static function init() {
 	 * @param int $post_id
 	 */
 	public static function publish_hook( $post_id ) {
-		// check if pingbacks are enabled
-		if ( get_option( 'default_pingback_flag' ) ) {
-			add_post_meta( $post_id, '_mentionme', '1', true );
-		}
+		add_post_meta( $post_id, '_mentionme', '1', true );
 	}
 
 	/**

includes/functions.php

@@ -252,3 +252,20 @@ function wp_get_meta_tags( $source_content ) {
 		return $meta_tags;
 	}
 endif;
+
+
+/* Backward compatibility for function available in version 5.1 and above */
+if ( ! function_exists( 'is_avatar_comment_type' ) ) :
+	function is_avatar_comment_type( $comment_type ) {
+		/**
+		 * Filters the list of allowed comment types for retrieving avatars.
+		 *
+		 * @since 3.0.0
+		 *
+		 * @param array $types An array of content types. Default only contains 'comment'.
+		 */
+		$allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
+
+			return in_array( $comment_type, (array) $allowed_comment_types, true );
+	}
+endif;