WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media: Explicitly declare the `$pagenow` global in `wp_get_attachment_url()`. 

This avoids an "Undefined index" PHP notice in the function when running the `media` test group separately.

Follow-up to [32342], [50156], [50164], [50393].

Props johnbillion.
Fixes #52606.
Built from https://develop.svn.wordpress.org/trunk@50406


git-svn-id: http://core.svn.wordpress.org/trunk@50017 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2021-02-22 18:55:07 +00:00
parent a088b586ec
commit c6c1ef3c32
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/post.php
View File

@ -6277,6 +6277,8 @@ function wp_update_attachment_metadata( $attachment_id, $data ) {
* @return string|false Attachment URL, otherwise false. * @return string|false Attachment URL, otherwise false.
*/ */
function wp_get_attachment_url( $attachment_id = 0 ) { function wp_get_attachment_url( $attachment_id = 0 ) {
global $pagenow;
$attachment_id = (int) $attachment_id; $attachment_id = (int) $attachment_id;
$post = get_post( $attachment_id ); $post = get_post( $attachment_id );
@ -6319,7 +6321,7 @@ function wp_get_attachment_url( $attachment_id = 0 ) {
} }
// On SSL front end, URLs should be HTTPS. // On SSL front end, URLs should be HTTPS.
if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] ) { if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow ) {
$url = set_url_scheme( $url ); $url = set_url_scheme( $url );
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.7-beta3-50401'; $wp_version = '5.7-beta3-50406';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.