Changeset 44270

Timestamp:

12/17/2018 06:06:42 PM (8 years ago)

Author:

desrosj

Message:

Block Editor: Fix PHP warning when loading editor styles while in RTL.

In RTL languages, WordPress adds style-editor-rtl.css editor styles to the global $editor_styles.
This patch ignores handling these styles if the file is not preset.

Also, clarify the docs for the return value of the block_version function.

Props mostafa.s1990, desrosj, mukesh27.

Merges [43923] and [43924] to trunk.

Fixes #45288, #45342.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-admin/edit-form-blocks.php (modified) (1 diff)
• src/wp-includes/blocks.php (modified) (1 diff)

trunk/src/wp-admin/edit-form-blocks.php

@@ -198 +198 @@
                         }
                 } else {
-                        $file     = get_theme_file_path( $style );
-                        $styles[] = array(
-                                'css'     => file_get_contents( get_theme_file_path( $style ) ),
-                                'baseURL' => get_theme_file_uri( $style ),
-                        );
+                        $file = get_theme_file_path( $style );
+                        if ( file_exists( $file ) ) {
+                                $styles[] = array(
+                                        'css'     => file_get_contents( $file ),
+                                        'baseURL' => get_theme_file_uri( $style ),
+                                );
+                        }
                 }
         }

trunk/src/wp-includes/blocks.php

@@ -284 +284 @@
  *
  * @param string $content Content to test.
- * @return int The block format version.
+ * @return int The block format version is 1 if the content contains one or more blocks, 0 otherwise.
  */
 function block_version( $content ) {