Changeset 31158

Timestamp:

01/12/2015 04:20:47 AM (12 years ago)

Author:

jeremyfelt

Message:

Use a less complex approach for enforcing path slashes in update_blog_details()

Ensure leading and traling slashes are in place and don't touch anything in the middle. Validating with array_filter() would have missed a possible valid falsy path - /my-path/0/.

Props nacin.

Fixes #18117.

Location:

trunk

Files:

• src/wp-includes/ms-blogs.php (modified) (1 diff)
• tests/phpunit/tests/multisite/site.php (modified) (1 diff)

trunk/src/wp-includes/ms-blogs.php

@@ -299 +299 @@
         foreach ( array_intersect( array_keys( $details ), $fields ) as $field ) {
                 if ( 'path' === $field ) {
-                        $details[ $field ] = array_filter( explode( '/', $details[ $field ] ) );
-                        $details[ $field ] = trailingslashit( '/' . implode( '/', $details[ $field ] ) );
+                        $details[ $field ] = trailingslashit( '/' . trim( $details[ $field ], '/' ) );
                 }
 

trunk/tests/phpunit/tests/multisite/site.php

@@ -592 +592 @@
         }
 
+        /**
+         * `update_blog_details()` does not resolve multiple slashes in the
+         * middle of a path string.
+         */
         function test_update_blog_details_multiple_paths_middle_slashes() {
                 update_blog_details( 1, array( 'path' => 'multiple///dirs' ) );
                 $blog = get_blog_details( 1 );
-                $this->assertEquals( '/multiple/dirs/', $blog->path );
+                $this->assertEquals( '/multiple///dirs/', $blog->path );
         }