Changeset 44231 for branches/5.0/src/wp-includes/script-loader.php

Timestamp:

12/16/2018 11:05:53 AM (8 years ago)

Author:

ocean90

Message:

Script Loader: Pass the suffix to package style handles to ensure correct file names for minified RTL stylesheets.

See #45547.

File:

• branches/5.0/src/wp-includes/script-loader.php (modified) (4 diffs)

branches/5.0/src/wp-includes/script-loader.php

@@ -1764 +1764 @@
         $styles->add( 'open-sans', $open_sans_font_url ); // No longer used in core as of 4.6
 
-        // RTL CSS
-        $rtl_styles = array(
-                // wp-admin
-                'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus',
-                'widgets', 'site-icon', 'l10n', 'install', 'wp-color-picker', 'customize-controls', 'customize-widgets', 'customize-nav-menus', 'customize-preview',
-                'ie', 'login',
-                // wp-includes
-                'buttons', 'admin-bar', 'wp-auth-check', 'editor-buttons', 'media-views', 'wp-pointer',
-                'wp-jquery-ui-dialog',
-                // deprecated
-                'deprecated-media', 'farbtastic',
-        );
-
-        foreach ( $rtl_styles as $rtl_style ) {
-                $styles->add_data( $rtl_style, 'rtl', 'replace' );
-                if ( $suffix ) {
-                        $styles->add_data( $rtl_style, 'suffix', $suffix );
-                }
-        }
-
         // Packages styles
         $fonts_url = '';
@@ -1799 +1779 @@
 
         $styles->add( 'wp-block-library-theme', "/wp-includes/css/dist/block-library/theme$suffix.css" );
-        $styles->add_data( 'wp-block-library-theme', 'rtl', 'replace' );
 
         $styles->add(
@@ -1812 +1791 @@
                 )
         );
-        $styles->add_data( 'wp-edit-blocks', 'rtl', 'replace' );
 
         $package_styles = array(
@@ -1826 +1804 @@
         foreach ( $package_styles as $package => $dependencies ) {
                 $handle  = 'wp-' . $package;
-                $path     = "/wp-includes/css/dist/$package/style$suffix.css";
+                $path    = "/wp-includes/css/dist/$package/style$suffix.css";
 
                 $styles->add( $handle, $path, $dependencies );
-                $styles->add_data( $handle, 'rtl', 'replace' );
+        }
+
+        // RTL CSS
+        $rtl_styles = array(
+                // Admin CSS
+                'common', 'forms', 'admin-menu', 'dashboard', 'list-tables', 'edit', 'revisions', 'media', 'themes', 'about', 'nav-menus',
+                'widgets', 'site-icon', 'l10n', 'install', 'wp-color-picker', 'customize-controls', 'customize-widgets', 'customize-nav-menus', 'customize-preview',
+                'ie', 'login',
+                // Includes CSS
+                'buttons', 'admin-bar', 'wp-auth-check', 'editor-buttons', 'media-views', 'wp-pointer',
+                'wp-jquery-ui-dialog',
+                // Package styles
+                'wp-block-library-theme', 'wp-edit-blocks', 'wp-block-library', 'wp-components', 'wp-edit-post', 'wp-editor', 'wp-format-library',
+                'wp-list-reusable-blocks', 'wp-nux',
+                // Deprecated CSS
+                'deprecated-media', 'farbtastic',
+        );
+
+        foreach ( $rtl_styles as $rtl_style ) {
+                $styles->add_data( $rtl_style, 'rtl', 'replace' );
+                if ( $suffix ) {
+                        $styles->add_data( $rtl_style, 'suffix', $suffix );
+                }
         }
 }