Changeset 62025

Timestamp:

03/14/2026 07:53:29 AM (5 months ago)

Author:

audrasjb

Message:

Toolbar: add CSS from admin color scheme on front-end.

This changeset introduces the wp_admin_bar_add_color_scheme_to_front_end() which is hooked on admin_bar_init in order to use the CSS from admin color schemes on the admin bar on front-end, as inline styles.

Props sabernhardt, huzaifaalmesbah, audrasjb, johnbillion, noruzzaman, JeffPaul, joedolson, huzaifaalmesbah, amesplant, r1k0, shailu25.
Fixes #64762.

Location:

trunk

Files:

• src/wp-includes/admin-bar.php (modified) (1 diff)
• src/wp-includes/default-filters.php (modified) (1 diff)
• tests/phpunit/tests/dependencies/wpStyleLoaderSrc.php (modified) (2 diffs)

trunk/src/wp-includes/admin-bar.php

@@ -1438 +1438 @@
         return 'true' === $pref;
 }
+
+/**
+ * Adds CSS from the administration color scheme stylesheet on the front end.
+ *
+ * @since 7.0.0
+ *
+ * @global array $_wp_admin_css_colors Registered administration color schemes.
+ */
+function wp_admin_bar_add_color_scheme_to_front_end() {
+        if ( is_admin() ) {
+                return;
+        }
+
+        global $_wp_admin_css_colors;
+
+        if ( empty( $_wp_admin_css_colors ) ) {
+                register_admin_color_schemes();
+        }
+
+        $color_scheme = get_user_option( 'admin_color' );
+
+        if ( empty( $color_scheme ) || ! isset( $_wp_admin_css_colors[ $color_scheme ] ) ) {
+                $color_scheme = 'modern';
+        }
+
+        $color = $_wp_admin_css_colors[ $color_scheme ] ?? null;
+        $url   = $color->url ?? '';
+
+        if ( $url ) {
+                $response = wp_remote_get( $url );
+                if ( ! is_wp_error( $response ) ) {
+                        $css = $response['body'];
+                        if ( is_string( $css ) && str_contains( $css, '#wpadminbar' ) ) {
+                                $start_position = strpos( $css, '#wpadminbar' );
+                                $end_position   = strpos( $css, '.wp-pointer' );
+                                if ( false !== $end_position && $end_position > $start_position ) {
+                                        $css = substr( $css, $start_position, $end_position - $start_position );
+                                        if ( SCRIPT_DEBUG ) {
+                                                $css = str_replace( '/* Pointers */', '', $css );
+                                        }
+                                }
+                                wp_add_inline_style( 'admin-bar', $css );
+                        }
+                }
+        }
+}

trunk/src/wp-includes/default-filters.php

@@ -709 +709 @@
 add_action( 'wp_footer', 'wp_admin_bar_render', 1000 ); // Back-compat for themes not using `wp_body_open`.
 add_action( 'in_admin_header', 'wp_admin_bar_render', 0 );
+add_action( 'admin_bar_init', 'wp_admin_bar_add_color_scheme_to_front_end', 0 );
 
 // Former admin filters that can also be hooked on the front end.

trunk/tests/phpunit/tests/dependencies/wpStyleLoaderSrc.php

@@ -13 +13 @@
         /**
          * Tests that PHP warnings are not thrown when wp_style_loader_src() is called
-         * before the `$_wp_admin_css_colors` global is set.
+         * before the `$_wp_admin_css_colors` global is set within the admin.
          *
          * The warnings that we should not see:
@@ -20 +20 @@
          *
          * @ticket 61302
+         * @ticket 64762
          */
         public function test_without_wp_admin_css_colors_global() {
-                $this->assertFalse( wp_style_loader_src( '', 'colors' ) );
+                if ( is_admin() ) {
+                        $this->assertFalse( wp_style_loader_src( '', 'colors' ) );
+                } else {
+                        $this->assertStringContainsString( '/colors.css', wp_style_loader_src( '', 'colors' ) );
+                }
         }
 }