Enforce non-null string in qtranxf_split (#1314)

qtranslate · Apr 10, 2023 · 17b43b5 · 17b43b5
1 parent 7dbd781
commit 17b43b5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/compatibility.php b/src/compatibility.php
@@ -53,15 +53,15 @@ function qtrans_getSortedLanguages( bool $reverse = false ): array {
 if ( ! function_exists( 'qtrans_join' ) ) {
     function qtrans_join( $texts ): string {
         if ( ! is_array( $texts ) ) {
-            $texts = qtranxf_split( $texts );
+            $texts = qtranxf_split( $texts ?? '' );
         }
 
         return qtranxf_join_b( $texts );
     }
 }
 if ( ! function_exists( 'qtrans_split' ) ) {
     function qtrans_split( $text, bool $quicktags = true ): array {
-        return qtranxf_split( $text );
+        return qtranxf_split( $text ?? '' );
     }
 }
 if ( ! function_exists( 'qtrans_use' ) ) {

diff --git a/src/language_blocks.php b/src/language_blocks.php
@@ -30,14 +30,14 @@ function qtranxf_get_language_blocks( $text ): array {
 
 /**
  * Split a multilingual string into array of tokens by language.
+ * If the string is empty or non-multilingual, it is repeated for each language.
  *
- * @param string $text multilingual string.
+ * @param string $text String that can contain multilingual tokens.
  *
  * @return string[] array of string items indexed by language.
  */
-function qtranxf_split( $text ): array {
+function qtranxf_split( string $text ): array {
     $blocks = qtranxf_get_language_blocks( $text );
-
     return qtranxf_split_blocks( $blocks );
 }
 

diff --git a/src/modules/acf/extended.php b/src/modules/acf/extended.php
@@ -77,7 +77,7 @@ public static function encode_language_values( array $values ): string {
      * @return array
      */
     public static function decode_language_values( ?string $values ): array {
-        return qtranxf_split( $values );
+        return qtranxf_split( $values ?? '' );
     }
 
     /**