From f955bcce548b916ba4db3a1f9944040d20036638 Mon Sep 17 00:00:00 2001
From: John Blackbourn <johnbillion@git.wordpress.org>
Date: Tue, 16 Feb 2021 17:34:04 +0000
Subject: [PATCH] Feeds: Fix the URL returned by `get_feed_link()` when pretty
 permalinks are not in use.

Props hauvong, peterwilsoncc, SergeyBiryukov

Fixes #51839

Built from https://develop.svn.wordpress.org/trunk@50354


git-svn-id: http://core.svn.wordpress.org/trunk@49965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/link-template.php | 2 +-
 wp-includes/version.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 85b61e3a5a..9554de3d2f 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -690,7 +690,7 @@ function get_feed_link( $feed = '' ) {
 
 	$permalink = $wp_rewrite->get_feed_permastruct();
 
-	if ( '' !== $permalink ) {
+	if ( $permalink ) {
 		if ( false !== strpos( $feed, 'comments_' ) ) {
 			$feed      = str_replace( 'comments_', '', $feed );
 			$permalink = $wp_rewrite->get_comment_feed_permastruct();
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3ab0e5f14d..26898b4bf9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-beta2-50353';
+$wp_version = '5.7-beta2-50354';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.