Changeset 3008

Timestamp:

04/26/2016 07:29:01 AM (9 years ago)

Author:

dd32

Message:

Plugin Directory: Tighten up the regular expression when parsing assets to avoid notices where unrecognised assets may be matched (for example, an error using a unicode cross rather than x in a banner filename).

See #1584

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php (modified) (1 diff)

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

@@ -177 +177 @@
             foreach ( $svn_assets_folder as $asset ) {
                 // screenshot-0.(png|jpg|jpeg|gif)  ||  icon.svg
-                if ( ! preg_match( '!^(?P<type>screenshot|banner|icon)(-(?P<resolution>[^\s]+)\.(png|jpg|jpeg|gif)|\.svg)$!i', $asset['filename'], $m ) ) {
+                if ( ! preg_match( '!^(?P<type>screenshot|banner|icon)(-(?P<resolution>[\dx]+)\.(png|jpg|jpeg|gif)|\.svg)$!i', $asset['filename'], $m ) ) {
                     continue;
                 }