Changeset 7075

Timestamp:

04/10/2018 04:24:17 AM (6 years ago)

Author:

dd32

Message:

Plugin Directory: API Updater: Lessen how much data is stored for plugin assets.

• default is only needed for icons, banners don't need it.
• default is now only used for icons 'geopattern' default icons.

See #3265.

Location:

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

Files:

• class-template.php (modified) (1 diff)
• jobs/class-api-update-updater.php (modified) (3 diffs)

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 = $svg = self::get_geopattern_icon_url( $plugin );
+            $icon = self::get_geopattern_icon_url( $plugin );
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/jobs/class-api-update-updater.php

@@ -127 +127 @@
             $banners['1x'] = $raw_banners['banner'];
         }
-        if ( $banners ) {
-            $banners['default']  = $banners['2x'] ?? $banners['1x'];
-        }
 
         // RTL Banners (get_plugin_banner 'raw_with_rtl' returns these)
@@ -137 +134 @@
         if ( !empty( $raw_banners['banner_rtl'] ) ) {
             $banners_rtl['1x'] = $raw_banners['banner_rtl'];
-        }
-        if ( $banners_rtl ) {
-            $banners_rtl['default']  = $banners_rtl['2x'] ?? $banners_rtl['1x'];
         }
 
@@ -151 +145 @@
         if ( !empty( $raw_icons['svg'] ) ) {
             $icons['svg'] = $raw_icons['svg'];
+        }
+        if ( !empty( $raw_icons['generated'] ) ) {
+            // Geopattern SVG will be in 'icon':
+            $icons['default'] = $raw_icons['icon'];
 
-            // We don't need to set the 1x field when it's the SVG.
-            if ( isset( $icons['1x'] ) && $icons['1x'] == $icons['svg'] ) {
-                unset( $icons['1x'] );
-            }
-        }
-        if ( $icons ) {
-            $icons['default'] = $icons['svg'] ?? ( $icons['2x'] ?? $icons['1x'] );
+            // Don't set the `1x` field when it's a geopattern icon
+            unset( $icons['1x'] );
         }