Changeset 44546 for trunk/src/wp-includes/bookmark.php

Timestamp:

01/10/2019 09:05:50 PM (6 years ago)

Author:

flixos90

Message:

General: Fix problematic string to array parsing.

WordPress has historically often used code like preg_split( '/[\s,]+/', $var ) to parse a string of comma-separated values into an array. However, this approach was causing an empty string to not be parsed into an empty array as expected, but rather into an array with the empty string as its sole element.

This was among other areas causing problems in the REST API where passing an empty request parameter could cause that request to fail because, instead of it being ignored, that parameter would be compared against the valid values for it, which typically do not include an empty string.

Props david.binda, sstoqnov.
Fixes #43977.

File:

• trunk/src/wp-includes/bookmark.php (modified) (3 diffs)

trunk/src/wp-includes/bookmark.php

@@ -172 +172 @@
         $r['category']      = '';
         $r['category_name'] = '';
-        $inclinks           = preg_split( '/[\s,]+/', $r['include'] );
+        $inclinks           = wp_parse_id_list( $r['include'] );
         if ( count( $inclinks ) ) {
             foreach ( $inclinks as $inclink ) {
                 if ( empty( $inclusions ) ) {
-                    $inclusions = ' AND ( link_id = ' . intval( $inclink ) . ' ';
+                    $inclusions = ' AND ( link_id = ' . $inclink . ' ';
                 } else {
-                    $inclusions .= ' OR link_id = ' . intval( $inclink ) . ' ';
+                    $inclusions .= ' OR link_id = ' . $inclink . ' ';
                 }
             }
@@ -189 +189 @@
     $exclusions = '';
     if ( ! empty( $r['exclude'] ) ) {
-        $exlinks = preg_split( '/[\s,]+/', $r['exclude'] );
+        $exlinks = wp_parse_id_list( $r['exclude'] );
         if ( count( $exlinks ) ) {
             foreach ( $exlinks as $exlink ) {
                 if ( empty( $exclusions ) ) {
-                    $exclusions = ' AND ( link_id <> ' . intval( $exlink ) . ' ';
+                    $exclusions = ' AND ( link_id <> ' . $exlink . ' ';
                 } else {
-                    $exclusions .= ' AND link_id <> ' . intval( $exlink ) . ' ';
+                    $exclusions .= ' AND link_id <> ' . $exlink . ' ';
                 }
             }
@@ -224 +224 @@
     $join           = '';
     if ( ! empty( $r['category'] ) ) {
-        $incategories = preg_split( '/[\s,]+/', $r['category'] );
+        $incategories = wp_parse_id_list( $r['category'] );
         if ( count( $incategories ) ) {
             foreach ( $incategories as $incat ) {
                 if ( empty( $category_query ) ) {
-                    $category_query = ' AND ( tt.term_id = ' . intval( $incat ) . ' ';
+                    $category_query = ' AND ( tt.term_id = ' . $incat . ' ';
                 } else {
-                    $category_query .= ' OR tt.term_id = ' . intval( $incat ) . ' ';
+                    $category_query .= ' OR tt.term_id = ' . $incat . ' ';
                 }
             }