Ticket #43977: 43977.diff

src/wp-includes/bookmark.php

@@ -171 +171 @@
                 $r['exclude']       = '';  //ignore exclude, category, and category_name params if using include
                 $r['category']      = '';
                 $r['category_name'] = '';
-                $inclinks           = preg_split( '/[\s,]+/', $r['include'] );
+                $inclinks           = preg_split( '/[\s,]+/', $r['include'], -1, PREG_SPLIT_NO_EMPTY );
                 if ( count( $inclinks ) ) {
                         foreach ( $inclinks as $inclink ) {
                                 if ( empty( $inclusions ) ) {
@@ -188 +188 @@
 
         $exclusions = '';
         if ( ! empty( $r['exclude'] ) ) {
-                $exlinks = preg_split( '/[\s,]+/', $r['exclude'] );
+                $exlinks = preg_split( '/[\s,]+/', $r['exclude'], -1, PREG_SPLIT_NO_EMPTY );
                 if ( count( $exlinks ) ) {
                         foreach ( $exlinks as $exlink ) {
                                 if ( empty( $exclusions ) ) {
@@ -223 +223 @@
         $category_query = '';
         $join           = '';
         if ( ! empty( $r['category'] ) ) {
-                $incategories = preg_split( '/[\s,]+/', $r['category'] );
+                $incategories = preg_split( '/[\s,]+/', $r['category'], -1, PREG_SPLIT_NO_EMPTY );
                 if ( count( $incategories ) ) {
                         foreach ( $incategories as $incat ) {
                                 if ( empty( $category_query ) ) {

src/wp-includes/class-wp-comment-query.php

@@ -484 +484 @@
                 $status_clauses = array();
                 $statuses       = $this->query_vars['status'];
                 if ( ! is_array( $statuses ) ) {
-                        $statuses = preg_split( '/[\s,]+/', $statuses );
+                        $statuses = preg_split( '/[\s,]+/', $statuses, -1, PREG_SPLIT_NO_EMPTY );
                 }
 
                 // 'any' overrides other statuses.
@@ -521 +521 @@
 
                         // Accepts arrays or comma-separated strings.
                         if ( ! is_array( $include_unapproved ) ) {
-                                $include_unapproved = preg_split( '/[\s,]+/', $include_unapproved );
+                                $include_unapproved = preg_split( '/[\s,]+/', $include_unapproved, -1, PREG_SPLIT_NO_EMPTY );
                         }
 
                         $unapproved_ids = $unapproved_emails = array();

src/wp-includes/functions.php

@@ -3693 +3693 @@
  */
 function wp_parse_id_list( $list ) {
         if ( ! is_array( $list ) ) {
-                $list = preg_split( '/[\s,]+/', $list );
+                $list = preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
         }
 
         return array_unique( array_map( 'absint', $list ) );
@@ -3709 +3709 @@
  */
 function wp_parse_slug_list( $list ) {
         if ( ! is_array( $list ) ) {
-                $list = preg_split( '/[\s,]+/', $list );
+                $list = preg_split( '/[\s,]+/', $list, -1, PREG_SPLIT_NO_EMPTY );
         }
 
         foreach ( $list as $key => $value ) {

src/wp-includes/post.php

@@ -4965 +4965 @@
 
         $author_query = '';
         if ( ! empty( $r['authors'] ) ) {
-                $post_authors = preg_split( '/[\s,]+/', $r['authors'] );
+                $post_authors = preg_split( '/[\s,]+/', $r['authors'], -1, PREG_SPLIT_NO_EMPTY );
 
                 if ( ! empty( $post_authors ) ) {
                         foreach ( $post_authors as $post_author ) {

src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php

@@ -521 +521 @@
                 if ( ! isset( $request['_fields'] ) ) {
                         return $fields;
                 }
-                $requested_fields = is_array( $request['_fields'] ) ? $request['_fields'] : preg_split( '/[\s,]+/', $request['_fields'] );
+                $requested_fields = is_array( $request['_fields'] ) ? $request['_fields'] : preg_split( '/[\s,]+/', $request['_fields'], -1, PREG_SPLIT_NO_EMPTY );
                 if ( 0 === count( $requested_fields ) ) {
                         return $fields;
                 }

src/wp-includes/rest-api.php

@@ -651 +651 @@
 
         $data = $response->get_data();
 
-        $fields = is_array( $request['_fields'] ) ? $request['_fields'] : preg_split( '/[\s,]+/', $request['_fields'] );
+        $fields = is_array( $request['_fields'] ) ? $request['_fields'] : preg_split( '/[\s,]+/', $request['_fields'], -1, PREG_SPLIT_NO_EMPTY );
 
         if ( 0 === count( $fields ) ) {
                 return $response;
@@ -1082 +1082 @@
 function rest_validate_value_from_schema( $value, $args, $param = '' ) {
         if ( 'array' === $args['type'] ) {
                 if ( ! is_array( $value ) ) {
-                        $value = preg_split( '/[\s,]+/', $value );
+                        $value = preg_split( '/[\s,]+/', $value, -1, PREG_SPLIT_NO_EMPTY );
                 }
                 if ( ! wp_is_numeric_array( $value ) ) {
                         /* translators: 1: parameter, 2: type name */
@@ -1226 +1226 @@
                         return (array) $value;
                 }
                 if ( ! is_array( $value ) ) {
-                        $value = preg_split( '/[\s,]+/', $value );
+                        $value = preg_split( '/[\s,]+/', $value, -1, PREG_SPLIT_NO_EMPTY );
                 }
                 foreach ( $value as $index => $v ) {
                         $value[ $index ] = rest_sanitize_value_from_schema( $v, $args['items'] );