Changeset 7048

Timestamp:

04/06/2018 04:27:35 AM (7 years ago)

Author:

dd32

Message:

Plugin Directory: Use geopattern icons from a CDN svg rather than using data URI's inline on the page.

See #3265.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory

Files:

• class-plugin-directory.php (modified) (1 diff)
• class-template.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -502 +502 @@
         add_rewrite_rule( '^search/([^/]+)/?$', 'index.php?s=$matches[1]', 'top' );
 
-        // Add a rule for generated plugin icons. geopattern-icon/demo.svg | geopattern-icon/demo.abc123.svg
-        add_rewrite_rule( '^geopattern-icon/([^/]+)(\.([a-f0-9]{6}))?\.svg$', 'index.php?name=$matches[1]&geopattern_icon=$matches[3]', 'top' );
+        // Add a rule for generated plugin icons. geopattern-icon/demo.svg | geopattern-icon/demo_abc123.svg
+        add_rewrite_rule( '^geopattern-icon/([^/_]+)(_([a-f0-9]{6}))?\.svg$', 'index.php?name=$matches[1]&geopattern_icon=$matches[3]', 'top' );
 
         // Handle plugin admin requests

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php

@@ -390 +390 @@
         if ( ! $icon || 'publish' !== $plugin->post_status ) {
             $generated = true;
-
-            $icon = new Plugin_Geopattern();
-            $icon->setString( $plugin->post_name );
-
-            // Use the average color of the first known banner as the icon background color
-            if ( $color = get_post_meta( $plugin->ID, 'assets_banners_color', true ) ) {
-                if ( strlen( $color ) === 6 && strspn( $color, 'abcdef0123456789' ) === 6 ) {
-                    $icon->setColor( '#' . $color );
-                }
-            }
-
-            $icon = $icon->toDataURI();
+            $icon = self::get_geopattern_icon_url( $plugin );
         }
 
@@ -425 +414 @@
 
     /**
+     * Retrieve the Geopattern SVG URL for a given plugin.
+     */
+    public static function get_geopattern_icon_url( $post = null, $color = null ) {
+        $plugin = get_post( $post );
+
+        if ( is_null( $color ) ) {
+            $color = get_post_meta( $plugin->ID, 'assets_banners_color', true );
+        }
+
+        if ( strlen( $color ) === 6 && strspn( $color, 'abcdef0123456789' ) === 6 ) {
+            $color = "_{$color}";
+        } else {
+            $color = '';
+        }
+
+        // This is a cached resource. The slug + color combine to form the cache buster.
+        $url = "https://s.w.org/plugins/geopattern-icon/{$plugin->post_name}{$color}.svg";
+
+        return $url;
+    }
+
+    /**
      * Retrieve the Plugin banner details for a plugin.
      *