Changeset 55427

Timestamp:

02/27/2023 05:30:07 PM (2 years ago)

Author:

flixos90

Message:

Twenty Twenty: Avoid PHP warnings in 8.1 due to incorrect usage of wp_add_inline_style().

This changeset adjusts the logic to use a more defensive approach, to avoid passing potentially invalid values to wp_add_inline_style().

Props flixos90, mukesh27, costdev, swissspidy, poena, sabernhardt.
Fixes #57777.

Location:

trunk/src/wp-content/themes/twentytwenty

Files:

• classes/class-twentytwenty-non-latin-languages.php (modified) (3 diffs)
• functions.php (modified) (3 diffs)

trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php

@@ -26 +26 @@
          *
          * @param string $type Whether to return CSS for the "front-end", "block-editor", or "classic-editor".
-         * @return void
+         * @return string|null Custom CSS, or null if not applicable.
          */
         public static function get_non_latin_css( $type = 'front-end' ) {
@@ -106 +106 @@
             // Return if the selected language has no fallback fonts.
             if ( empty( $font_family[ $locale ] ) ) {
-                return;
+                return null;
             }
 
@@ -127 +127 @@
             // Return if the specified type doesn't exist.
             if ( empty( $elements[ $type ] ) ) {
-                return;
+                return null;
             }
 

trunk/src/wp-content/themes/twentytwenty/functions.php

@@ -197 +197 @@
 
     // Add output of Customizer settings as inline style.
-    wp_add_inline_style( 'twentytwenty-style', twentytwenty_get_customizer_css( 'front-end' ) );
+    $customizer_css = twentytwenty_get_customizer_css( 'front-end' );
+    if ( $customizer_css ) {
+        wp_add_inline_style( 'twentytwenty-style', $customizer_css );
+    }
 
     // Add print CSS.
@@ -425 +428 @@
 
     // Add inline style from the Customizer.
-    wp_add_inline_style( 'twentytwenty-block-editor-styles', twentytwenty_get_customizer_css( 'block-editor' ) );
+    $customizer_css = twentytwenty_get_customizer_css( 'block-editor' );
+    if ( $customizer_css ) {
+        wp_add_inline_style( 'twentytwenty-block-editor-styles', $customizer_css );
+    }
 
     // Add inline style for non-latin fonts.
-    wp_add_inline_style( 'twentytwenty-block-editor-styles', TwentyTwenty_Non_Latin_Languages::get_non_latin_css( 'block-editor' ) );
+    $custom_css = TwentyTwenty_Non_Latin_Languages::get_non_latin_css( 'block-editor' );
+    if ( $custom_css ) {
+        wp_add_inline_style( 'twentytwenty-block-editor-styles', $custom_css );
+    }
 
     // Enqueue the editor script.
@@ -465 +474 @@
 
     $styles = twentytwenty_get_customizer_css( 'classic-editor' );
+
+    if ( ! $styles ) {
+        return $mce_init;
+    }
 
     if ( ! isset( $mce_init['content_style'] ) ) {