From 2ebc78cbf43b101db6df54ab8506dae39d02b592 Mon Sep 17 00:00:00 2001
From: iandunn <iandunn@git.wordpress.org>
Date: Wed, 16 Dec 2020 14:05:07 +0000
Subject: [PATCH] Feed: Replace `join()` with `implode()` for safety.

Canonical functions should be used instead of aliases, because aliases can be deprecated or removed withough much notice. See r49193.

Props SergeyBiryukov.
See #51056.

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


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

diff --git a/wp-includes/class-wp-simplepie-file.php b/wp-includes/class-wp-simplepie-file.php
index 56d3047112..beb40efbcd 100644
--- a/wp-includes/class-wp-simplepie-file.php
+++ b/wp-includes/class-wp-simplepie-file.php
@@ -87,7 +87,7 @@ class WP_SimplePie_File extends SimplePie_File {
 					if ( 'content-type' === $name ) {
 						$this->headers[ $name ] = array_pop( $value );
 					} else {
-						$this->headers[ $name ] = join( ', ', $value );
+						$this->headers[ $name ] = implode( ', ', $value );
 					}
 				}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 175fa6bfb5..31820dd9d5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-alpha-49804';
+$wp_version = '5.7-alpha-49805';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.