From 8e411afb121c76f1f81b0e825b194ec34436452f Mon Sep 17 00:00:00 2001 From: Alex Kirk Date: Thu, 18 Jan 2024 18:49:43 +0100 Subject: [PATCH] Also resolve non-protocol feed URL when adding it through the feeds list --- includes/class-admin.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/includes/class-admin.php b/includes/class-admin.php index 766de34a..32f15cea 100644 --- a/includes/class-admin.php +++ b/includes/class-admin.php @@ -1426,6 +1426,11 @@ public function process_admin_edit_friend_feeds() { $user_feed = $existing_feeds[ $term_id ]; unset( $existing_feeds[ $term_id ] ); + $protocol = wp_parse_url( $feed['url'], PHP_URL_SCHEME ); + if ( ! $protocol ) { + $feed['url'] = apply_filters( 'friends_rewrite_incoming_url', 'https://' . $feed['url'], $feed['url'] ); + } + if ( $user_feed->get_url() !== $feed['url'] ) { do_action( 'friends_user_feed_deactivated', $user_feed ); @@ -1435,7 +1440,9 @@ public function process_admin_edit_friend_feeds() { if ( $feed['active'] ) { $new_feed = $friend->subscribe( $feed['url'], $feed ); - do_action( 'friends_user_feed_activated', $new_feed ); + if ( ! is_wp_error( $new_feed ) ) { + do_action( 'friends_user_feed_activated', $new_feed ); + } } else { $new_feed = $friend->save_feed( $feed['url'], $feed ); }