Changeset 31155

Timestamp:

01/12/2015 01:42:46 AM (12 years ago)

Author:

jeremyfelt

Message:

Enforce leading and trailing slashes on paths updated with update_blog_details()

In multisite, core expects the stored value for a site's path to have leading and trailing slashes. When these slashes are missing, it becomes impossible to visit the site.

This enforces proper /path/ creation in update_blog_details(), most likely used when updating an existing site through site-info.php.

Props earnjam, simonwheatley.

Fixes #18117. Fixes #23865.

Location:

trunk

Files:

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

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

@@ -297 +297 @@
         $update_details = array();
         $fields = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id');
-        foreach ( array_intersect( array_keys( $details ), $fields ) as $field )
-                $update_details[$field] = $details[$field];
+        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 ] ) );
+                }
+
+                $update_details[ $field ] = $details[ $field ];
+        }
 
         $result = $wpdb->update( $wpdb->blogs, $update_details, array('blog_id' => $blog_id) );

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

@@ -344 +344 @@
 
                 $this->assertEquals( 'example.com', $blog->domain );
-                $this->assertEquals( 'my_path/', $blog->path );
+                $this->assertEquals( '/my_path/', $blog->path );
                 $this->assertEquals( '0', $blog->spam );
         }
@@ -541 +541 @@
                 global $test_action_counter;
                 $test_action_counter++;
+        }
+
+        /**
+         * When the path for a site is updated with update_blog_details(), the final
+         * path should have a leading and trailing slash. When multiple directories
+         * are part of the path, only one slash should separate each directory.
+         * 
+         * @ticket 18117 
+         */ 
+        function test_update_blog_details_single_path_no_slashes() {
+                update_blog_details( 1, array( 'path' => 'my_path' ) );
+                $blog = get_blog_details( 1 );
+                $this->assertEquals( '/my_path/', $blog->path );
+        }
+
+        function test_update_blog_details_single_path_double_trailing_slashes() {
+                update_blog_details( 1, array( 'path' => 'my_path//' ) );
+                $blog = get_blog_details( 1 );
+                $this->assertEquals( '/my_path/', $blog->path );
+        }
+
+        function test_update_blog_details_single_path_double_leading_slashes() {
+                update_blog_details( 1, array( 'path' => '//my_path' ) );
+                $blog = get_blog_details( 1 );
+                $this->assertEquals( '/my_path/', $blog->path );
+        }
+
+        function test_update_blog_details_single_path_single_trailing_slash() {
+                update_blog_details( 1, array( 'path' => 'my_path/' ) );
+                $blog = get_blog_details( 1 );
+                $this->assertEquals( '/my_path/', $blog->path );
+        }
+
+        function test_update_blog_details_single_path_single_leading_slashes() {
+                update_blog_details( 1, array( 'path' => '/my_path' ) );
+                $blog = get_blog_details( 1 );
+                $this->assertEquals( '/my_path/', $blog->path );
+        }
+
+        function test_update_blog_details_single_path_both_slashes() {
+                update_blog_details( 1, array( 'path' => '/my_path/' ) );
+                $blog = get_blog_details( 1 );
+                $this->assertEquals( '/my_path/', $blog->path );
+        }
+
+        function test_update_blog_details_multiple_paths_no_slashes() {
+                update_blog_details( 1, array( 'path' => 'multiple/dirs' ) );
+                $blog = get_blog_details( 1 );
+                $this->assertEquals( '/multiple/dirs/', $blog->path );
+        }
+
+        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 );
+        }
+
+        function test_update_blog_details_multiple_paths_leading_slash() {
+                update_blog_details( 1, array( 'path' => '/multiple/dirs' ) );
+                $blog = get_blog_details( 1 );
+                $this->assertEquals( '/multiple/dirs/', $blog->path );
+        }
+
+        function test_update_blog_details_multiple_paths_trailing_slash() {
+                update_blog_details( 1, array( 'path' => 'multiple/dirs/' ) );
+                $blog = get_blog_details( 1 );
+                $this->assertEquals( '/multiple/dirs/', $blog->path );
+        }
+
+        function test_update_blog_details_multiple_paths_both_slashes() {
+                update_blog_details( 1, array( 'path' => '/multiple/dirs/' ) );
+                $blog = get_blog_details( 1 );
+                $this->assertEquals( '/multiple/dirs/', $blog->path );
         }