Skip to content

Synchronise RSS and Atom enclosure functions #12290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
edent wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Synchronise RSS and Atom enclosure functions #12290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 33 additions & 10 deletions src/wp-includes/feed.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,13 +482,35 @@ function rss_enclosure() {
foreach ( (array) $val as $enc ) {
$enclosure = explode( "\n", $enc );

if ( count( $enclosure ) < 3 ) {
continue;
$url = '';
$type = '';
$length = 0;

$mimes = get_allowed_mime_types();

// Parse URL.
if ( isset( $enclosure[0] ) && is_string( $enclosure[0] ) ) {
$url = trim( $enclosure[0] );
}

// Only get the first element, e.g. 'audio/mpeg' from 'audio/mpeg mpga mp2 mp3'.
$t = preg_split( '/[ \t]/', trim( $enclosure[2] ) );
$type = $t[0];
// Parse length and type.
for ( $i = 1; $i <= 2; $i++ ) {
if ( isset( $enclosure[ $i ] ) ) {
$t = trim( $enclosure[ $i ] );
if ( is_numeric( $t ) ) {
$length = $t;
} elseif ( in_array( $t, $mimes, true ) ) {
$type = $t;
}
}
}

$html_link_tag = sprintf(
"<enclosure url=\"%s\" length=\"%d\" type=\"%s\" />\n",
esc_url( $url ),
esc_attr( $length ),
esc_attr( $type )
);

/**
* Filters the RSS enclosure HTML link tag for the current post.
Expand All @@ -497,7 +519,7 @@ function rss_enclosure() {
*
* @param string $html_link_tag The HTML link tag with a URI and other attributes.
*/
echo apply_filters( 'rss_enclosure', '<enclosure url="' . esc_url( trim( $enclosure[0] ) ) . '" length="' . absint( trim( $enclosure[1] ) ) . '" type="' . esc_attr( $type ) . '" />' . "\n" );
echo apply_filters( 'rss_enclosure', $html_link_tag );
}
}
}
Expand Down Expand Up @@ -540,10 +562,11 @@ function atom_enclosure() {
// Parse length and type.
for ( $i = 1; $i <= 2; $i++ ) {
if ( isset( $enclosure[ $i ] ) ) {
if ( is_numeric( $enclosure[ $i ] ) ) {
$length = trim( $enclosure[ $i ] );
} elseif ( in_array( $enclosure[ $i ], $mimes, true ) ) {
$type = trim( $enclosure[ $i ] );
$t = trim( $enclosure[ $i ] );
if ( is_numeric( $t ) ) {
$length = $t;
} elseif ( in_array( $t, $mimes, true ) ) {
$type = $t;
}
}
}
Expand Down
Loading