diff options
Diffstat (limited to 'src/wp-includes')
| -rw-r--r-- | src/wp-includes/customize/class-wp-customize-custom-css-setting.php | 3 | ||||
| -rw-r--r-- | src/wp-includes/ms-settings.php | 2 | ||||
| -rw-r--r-- | src/wp-includes/post-template.php | 6 | ||||
| -rw-r--r-- | src/wp-includes/script-loader.php | 6 | ||||
| -rw-r--r-- | src/wp-includes/theme.json | 7 |
5 files changed, 15 insertions, 9 deletions
diff --git a/src/wp-includes/customize/class-wp-customize-custom-css-setting.php b/src/wp-includes/customize/class-wp-customize-custom-css-setting.php index 0e6132f339..aab0e47530 100644 --- a/src/wp-includes/customize/class-wp-customize-custom-css-setting.php +++ b/src/wp-includes/customize/class-wp-customize-custom-css-setting.php @@ -197,9 +197,10 @@ final class WP_Customize_Custom_CSS_Setting extends WP_Customize_Setting { ) ); - if ( $r instanceof WP_Error ) { + if ( is_wp_error( $r ) ) { return false; } + $post_id = $r->ID; // Cache post ID in theme mod for performance to avoid additional DB query. diff --git a/src/wp-includes/ms-settings.php b/src/wp-includes/ms-settings.php index c665da17e3..e9d9f498e2 100644 --- a/src/wp-includes/ms-settings.php +++ b/src/wp-includes/ms-settings.php @@ -59,7 +59,7 @@ ms_subdomain_constants(); // have not been populated in the global scope through something like `sunrise.php`. if ( ! isset( $current_site ) || ! isset( $current_blog ) ) { - $domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) ); + $domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ?? '' ) ); if ( str_ends_with( $domain, ':80' ) ) { $domain = substr( $domain, 0, -3 ); $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 ); diff --git a/src/wp-includes/post-template.php b/src/wp-includes/post-template.php index d502cf4daa..edcc1e0f03 100644 --- a/src/wp-includes/post-template.php +++ b/src/wp-includes/post-template.php @@ -1771,7 +1771,7 @@ function prepend_attachment( $content ) { * @since 1.0.0 * * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post. - * @return string HTML content for password form for password protected post. + * @return string HTML content for password form for password-protected post. */ function get_the_password_form( $post = 0 ) { $post = get_post( $post ); @@ -1786,7 +1786,7 @@ function get_the_password_form( $post = 0 ) { if ( ! empty( $post->ID ) && wp_get_raw_referer() === get_permalink( $post->ID ) && isset( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] ) ) { /** * Filters the invalid password message shown on password-protected posts. - * The filter is only applied if the post is password protected. + * The filter is only applied if the post is password-protected. * * @since 6.8.0 * @@ -1807,7 +1807,7 @@ function get_the_password_form( $post = 0 ) { } $output = '<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" class="post-password-form' . $class . '" method="post">' . $redirect_field . $invalid_password_html . ' - <p>' . __( 'This content is password protected. To view it please enter your password below:' ) . '</p> + <p>' . __( 'This content is password-protected. To view it, please enter the password below.' ) . '</p> <p><label for="' . $field_id . '">' . __( 'Password:' ) . ' <input name="post_password" id="' . $field_id . '" type="password" spellcheck="false" required size="20"' . $aria . ' /></label> <input type="submit" name="Submit" value="' . esc_attr_x( 'Enter', 'post password form' ) . '" /></p></form> '; diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index 51efa328bf..fa4a038754 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -2900,7 +2900,7 @@ function wp_get_script_tag( $attributes ) { /** * Prints formatted `<script>` loader tag. * - * It is possible to inject attributes in the `<script>` tag via the {@see 'wp_script_attributes'} filter. + * It is possible to inject attributes in the `<script>` tag via the {@see 'wp_script_attributes'} filter. * Automatically injects type attribute if needed. * * @since 5.7.0 @@ -2914,7 +2914,7 @@ function wp_print_script_tag( $attributes ) { /** * Constructs an inline script tag. * - * It is possible to inject attributes in the `<script>` tag via the {@see 'wp_script_attributes'} filter. + * It is possible to inject attributes in the `<script>` tag via the {@see 'wp_inline_script_attributes'} filter. * Automatically injects type attribute if needed. * * @since 5.7.0 @@ -3003,7 +3003,7 @@ function wp_get_inline_script_tag( $data, $attributes = array() ) { /** * Prints an inline script tag. * - * It is possible to inject attributes in the `<script>` tag via the {@see 'wp_script_attributes'} filter. + * It is possible to inject attributes in the `<script>` tag via the {@see 'wp_inline_script_attributes'} filter. * Automatically injects type attribute if needed. * * @since 5.7.0 diff --git a/src/wp-includes/theme.json b/src/wp-includes/theme.json index 32873854e4..641c379557 100644 --- a/src/wp-includes/theme.json +++ b/src/wp-includes/theme.json @@ -373,7 +373,12 @@ "background": "#32373c" }, "spacing": { - "padding": "calc(0.667em + 2px) calc(1.333em + 2px)" + "padding": { + "top": "calc(0.667em + 2px)", + "right": "calc(1.333em + 2px)", + "bottom": "calc(0.667em + 2px)", + "left": "calc(1.333em + 2px)" + } }, "typography": { "fontSize": "inherit", |