Merge pull request #80 from dshanske/master

Use Passed Along Target and Minor Fixes

Author: pfefferle

includes/class-linkbacks-handler.php

@@ -101,19 +101,20 @@ public static function enhance( $commentdata, $comment = array(), $commentarr =
 			$commentdata['comment_meta'] = array();
 		}
 
-		// generate target
-		$target = get_permalink( $commentdata['comment_post_ID'] );
-
+		//  If target is not set then set based on permalink
+		if ( ! isset( $commentdata['target'] ) ) {
+			$commentdata['target'] = get_permalink( $commentdata['comment_post_ID'] );
+		}
 		// add replytocom if present
 		if ( isset( $commentdata['comment_parent'] ) && ! empty( $commentdata['comment_parent'] ) ) {
-			$target = add_query_arg( array( 'replytocom' => $commentdata['comment_parent'] ), $target );
+			$commentdata['target'] = add_query_arg( array( 'replytocom' => $commentdata['comment_parent'] ), $commentdata['target'] );
 		}
 
 		// add source url as comment-meta
 		$commentdata['comment_meta']['semantic_linkbacks_source'] = esc_url_raw( $commentdata['comment_author_url'] );
 
 		// adds a hook to enable some other semantic handlers for example schema.org
-		$commentdata = apply_filters( 'semantic_linkbacks_commentdata', $commentdata, $target );
+		$commentdata = apply_filters( 'semantic_linkbacks_commentdata', $commentdata );
 
 		// remove "webmention" comment-type if $type is "reply"
 		if ( isset( $commentdata['comment_meta']['semantic_linkbacks_type'] ) ) {
@@ -479,7 +480,7 @@ public static function get_avatar_comment_types( $types ) {
 		$types[] = 'trackback';
 		$types[] = 'webmention';
 
-		return $types;
+		return array_unique( $types );
 	}
 
 }

includes/class-linkbacks-mf2-handler.php

@@ -100,11 +100,10 @@ public static function get_rel_mapper() {
 	 * generate the comment data from the microformatted content
 	 *
 	 * @param WP_Comment $commentdata the comment object
-	 * @param string $target the target url
 	 *
 	 * @return array
 	 */
-	public static function generate_commentdata( $commentdata, $target ) {
+	public static function generate_commentdata( $commentdata ) {
 		global $wpdb;
 
 		// add source
@@ -122,7 +121,7 @@ public static function generate_commentdata( $commentdata, $target ) {
 		}
 
 		// get the entry of interest
-		$entry = self::get_representative_entry( $entries, $target );
+		$entry = self::get_representative_entry( $entries, $commentdata['target'] );
 
 		if ( empty( $entry ) ) {
 			return array();
@@ -191,7 +190,7 @@ public static function generate_commentdata( $commentdata, $target ) {
 			$commentdata['comment_meta']['semantic_linkbacks_type'] = wp_slash( 'rsvp:' . $properties['rsvp'][0] );
 		} else {
 			// get post type
-			$commentdata['comment_meta']['semantic_linkbacks_type'] = wp_slash( self::get_entry_type( $target, $entry, $mf_array ) );
+			$commentdata['comment_meta']['semantic_linkbacks_type'] = wp_slash( self::get_entry_type( $commentdata['target'], $entry, $mf_array ) );
 		}
 
 		return $commentdata;
@@ -406,6 +405,9 @@ public static function check_mf_attr( $key, $node ) {
 	 * @return boolean
 	 */
 	public static function compare_urls( $needle, $haystack, $schemeless = true ) {
+		if ( ! is_string( $needle ) || ! is_array( $haystack ) ) {
+			return false;
+		}
 		if ( true === $schemeless ) {
 			// remove url-scheme
 			$schemeless_target = preg_replace( '/^https?:\/\//i', '', $needle );