Changeset 61009 for trunk/src/wp-includes/blocks/loginout.php

Timestamp:

10/21/2025 07:11:53 AM (12 months ago)

Author:

ellatrix

Message:

Editor: update packages.

Updates the packages to match Gutenberg version 21.9.0 RC2.

Also updates the sync script to work with the new package-lock.json format.
Some reusable block tests were adjusted to work with more render arguments.
Added core-data to the ignore list for verify:source-maps because Yjs has been bundled by accident. To be removed in a follow-up. See https://core.trac.wordpress.org/ticket/64120. See ​https://github.com/WordPress/gutenberg/pull/72503.

See: ​https://github.com/WordPress/wordpress-develop/pull/10355.
See: https://core.trac.wordpress.org/ticket/64117.

Props ellatrix, dmsnell.
Fixes #64117.

File:

• trunk/src/wp-includes/blocks/loginout.php (modified) (2 diffs)

trunk/src/wp-includes/blocks/loginout.php

@@ -17 +17 @@
 function render_block_core_loginout( $attributes ) {
 
-        // Build the redirect URL.
+        /*
+         * Build the redirect URL. This current url fetching logic matches with the core.
+         *
+         * @see https://github.com/WordPress/wordpress-develop/blob/6bf62e58d21739938f3bb3f9e16ba702baf9c2cc/src/wp-includes/general-template.php#L528.
+         */
         $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
 
-        $classes  = is_user_logged_in() ? 'logged-in' : 'logged-out';
+        $user_logged_in = is_user_logged_in();
+
+        $classes  = $user_logged_in ? 'logged-in' : 'logged-out';
         $contents = wp_loginout(
                 isset( $attributes['redirectToCurrent'] ) && $attributes['redirectToCurrent'] ? $current_url : '',
@@ -27 +33 @@
 
         // If logged-out and displayLoginAsForm is true, show the login form.
-        if ( ! is_user_logged_in() && ! empty( $attributes['displayLoginAsForm'] ) ) {
+        if ( ! $user_logged_in && ! empty( $attributes['displayLoginAsForm'] ) ) {
                 // Add a class.
                 $classes .= ' has-login-form';