removed duplicate code

Author: pfefferle

includes/class-webmention-receiver.php

@@ -14,8 +14,6 @@ public static function init() {
 		// Filter the response to allow a webmention form if no parameters are passed
 		add_filter( 'rest_pre_serve_request', array( 'Webmention_Receiver', 'serve_request' ), 9, 4 );
 
-		add_action( 'comment_form_after', array( 'Webmention_Receiver', 'comment_form' ), 11 );
-
 		// endpoint discovery
 		add_action( 'wp_head', array( 'Webmention_Receiver', 'html_header' ), 99 );
 		add_action( 'send_headers', array( 'Webmention_Receiver', 'http_header' ) );
@@ -463,15 +461,6 @@ public static function publish_post_hook( $post_id ) {
 		}
 	}
 
-	/**
-	 * Render the Webmention comment form
-	 */
-	public static function comment_form() {
-		$template = apply_filters( 'webmention_comment_form', plugin_dir_path( __FILE__ ) . '../templates/webmention-comment-form.php' );
-
-		load_template( $template );
-	}
-
 	/**
 	 * The Webmention autodicovery meta-tags
 	 */

languages/wordpress-webmention.pot

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Webmention 3.1.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/webmention\n"
-"POT-Creation-Date: 2017-02-05 11:39:46+00:00\n"
+"POT-Creation-Date: 2017-02-05 13:10:14+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -13,52 +13,52 @@ msgstr ""
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "X-Generator: grunt-wp-i18n 0.5.4\n"
 
-#: includes/class-webmention-receiver.php:115
+#: includes/class-webmention-receiver.php:113
 msgid "Source is missing"
 msgstr ""
 
-#: includes/class-webmention-receiver.php:121
+#: includes/class-webmention-receiver.php:119
 msgid "Target is missing"
 msgstr ""
 
-#: includes/class-webmention-receiver.php:127
+#: includes/class-webmention-receiver.php:125
 msgid "Target is not on this domain"
 msgstr ""
 
-#: includes/class-webmention-receiver.php:133
+#: includes/class-webmention-receiver.php:131
 msgid "Target and source cannot direct to the same resource"
 msgstr ""
 
-#: includes/class-webmention-receiver.php:138
-#: includes/class-webmention-receiver.php:148
+#: includes/class-webmention-receiver.php:136
+#: includes/class-webmention-receiver.php:146
 msgid "Target is not a valid post"
 msgstr ""
 
-#: includes/class-webmention-receiver.php:143
+#: includes/class-webmention-receiver.php:141
 msgid "Pings are disabled for this post"
 msgstr ""
 
-#: includes/class-webmention-receiver.php:275
+#: includes/class-webmention-receiver.php:273
 msgid "Invalid data passed"
 msgstr ""
 
-#: includes/class-webmention-receiver.php:292
+#: includes/class-webmention-receiver.php:290
 msgid "Source URL not found"
 msgstr ""
 
-#: includes/class-webmention-receiver.php:307
+#: includes/class-webmention-receiver.php:305
 msgid "Page has Been Deleted"
 msgstr ""
 
-#: includes/class-webmention-receiver.php:309
+#: includes/class-webmention-receiver.php:307
 msgid "Page Removed for Legal Reasons"
 msgstr ""
 
-#: includes/class-webmention-receiver.php:322
+#: includes/class-webmention-receiver.php:320
 msgid "Cannot find target link"
 msgstr ""
 
-#: includes/class-webmention-receiver.php:449
+#: includes/class-webmention-receiver.php:447
 msgid "This %1$s was mentioned on <a href=\"%2$s\">%3$s</a>"
 msgstr ""
 
@@ -155,7 +155,7 @@ msgstr ""
 msgid "Webmention Settings"
 msgstr ""
 
-#: webmention.php:112
+#: webmention.php:114
 msgid "Webmentions"
 msgstr ""
 

readme.md

@@ -74,6 +74,7 @@ Project maintained on github at [pfefferle/wordpress-webmention](https://github.
 * added page support (server and client)
 * moved `webmention_post_id` filter to a global function (thanks @dshanske)
 * fixed https://wordpress.org/support/topic/form-for-entering-manual-pings-stays-on/
+* fixed some typos
 
 ### 3.0.1 ###
 

readme.txt

@@ -72,6 +72,7 @@ Project maintained on github at [pfefferle/wordpress-webmention](https://github.
 * added page support (server and client)
 * moved `webmention_post_id` filter to a global function (thanks @dshanske)
 * fixed https://wordpress.org/support/topic/form-for-entering-manual-pings-stays-on/
+* fixed some typos
 
 = 3.0.1 =
 

webmention.php

@@ -95,8 +95,10 @@ public static function discussion_settings() {
 	 * render the comment form
 	 */
 	public static function comment_form() {
+		$template = apply_filters( 'webmention_comment_form', plugin_dir_path( __FILE__ ) . 'templates/webmention-comment-form.php' );
+
 		if ( 1 == get_option( 'webmention_show_comment_form' ) ) {
-			load_template( plugin_dir_path( __FILE__ ) . 'templates/webmention-comment-form.php' );
+			load_template( $template );
 		}
 	}