Changeset 11501

Timestamp:

02/02/2022 02:49:00 AM (3 years ago)

Author:

dd32

Message:

Showcase: Properly define dashicons as a dependency for the showcase stylesheet.

The showcase was previously assuming that the header would always include dashicons automatically, but it's only enqueued automatically now when logged in.

Bonus: Some old non-SSL code was removed. Everything is SSL'd now.

Fixes #6073.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-showcase

Files:

• functions.php (modified) (1 diff)
• header.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/functions.php

@@ -42 +42 @@
     
     if ( empty( $screenshot ) ) {
-        $prefix = is_ssl() ? 'https://' : 'http://s.';
-        $screenshot = $prefix.'wordpress.com/mshots/v1/http%3A%2F%2F' . get_site_domain( true, false );
+        $screenshot = 'https://wordpress.com/mshots/v1/http%3A%2F%2F' . get_site_domain( true, false );
     } elseif ( function_exists( 'jetpack_photon_url' ) ) {
         $screenshot = jetpack_photon_url( $screenshot );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-showcase/header.php

@@ -5 +5 @@
 echo do_blocks( '<!-- wp:wporg/global-header /-->' );
 
-$prefix = is_ssl() ? 'https://' : 'http://s.';
-wp_enqueue_style( 'blog-wp4', $prefix.'wordpress.org/style/blog-wp4.css', array(), 4 );
-wp_enqueue_style( 'showcase', get_stylesheet_uri(), array(), 20 );
+wp_enqueue_style( 'blog-wp4', 'https://wordpress.org/style/blog-wp4.css', array(), 4 );
+wp_enqueue_style( 'showcase', get_stylesheet_uri(), array( 'dashicons' ), 20 );
 
 ?>