Ticket #18117: 18117.4.diff

src/wp-includes/ms-blogs.php

@@ -296 +296 @@
 
         $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) );
 
         if ( false === $result )

tests/phpunit/tests/multisite/site.php

@@ -293 +293 @@
                 $blog_id = $this->factory->blog->create( array( 'user_id' => $user_id, 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
                 $this->assertInternalType( 'int', $blog_id );
 
-                $result = update_blog_details( $blog_id, array('domain' => 'example.com', 'path' => 'my_path/') );
+                $result = update_blog_details( $blog_id, array('domain' => 'example.com', 'path' => '/my_path/') );
                 $this->assertTrue( $result );
 
                 $blog = get_blog_details( $blog_id );
                 $this->assertEquals( 'example.com', $blog->domain );
-                $this->assertEquals( 'my_path/', $blog->path );
+                $this->assertEquals( '/my_path/', $blog->path );
                 $this->assertEquals( '0', $blog->spam );
 
                 $result = update_blog_details( $blog_id, array('domain' => 'example2.com','spam' => 1) );
                 $this->assertTrue( $result );
                 $blog = get_blog_details( $blog_id );
                 $this->assertEquals( 'example2.com', $blog->domain );
-                $this->assertEquals( 'my_path/', $blog->path );
+                $this->assertEquals( '/my_path/', $blog->path );
                 $this->assertEquals( '1', $blog->spam );
 
                 $result = update_blog_details( $blog_id );
                 $this->assertFalse( $result );
                 $blog = get_blog_details( $blog_id );
                 $this->assertEquals( 'example2.com', $blog->domain );
-                $this->assertEquals( 'my_path/', $blog->path );
+                $this->assertEquals( '/my_path/', $blog->path );
                 $this->assertEquals( '1', $blog->spam );
 
                 $test_action_counter = 0;
@@ -444 +444 @@
         }
 
         /**
+         * Check the path for a sub-directory site is correctly sanitised, 
+         * and has a trailing slash. 
+         * 
+         * @ticket 18117 
+         */ 
+        function test_update_blog_sanitises_subdirectory_path() {
+
+                $user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
+                $blog_id = $this->factory->blog->create( array( 'user_id' => $user_id, 'path' => '/test_blogpath', 'title' => 'Test Title' ) );
+                $this->assertInternalType( 'int', $blog_id );
+
+                $result = update_blog_details( $blog_id, array('domain' => 'example.com', 'path' => 'my_path') );
+                $blog = get_blog_details( $blog_id );
+                $this->assertEquals( '/my_path/', $blog->path );
+
+                $result = update_blog_details( $blog_id, array('domain' => 'example.com', 'path' => 'my_path//') );
+                $blog = get_blog_details( $blog_id );
+                $this->assertEquals( '/my_path/', $blog->path );
+
+                $result = update_blog_details( $blog_id, array('domain' => 'example.com', 'path' => '//my_path') );
+                $blog = get_blog_details( $blog_id );
+                $this->assertEquals( '/my_path/', $blog->path );
+
+                $result = update_blog_details( $blog_id, array('domain' => 'example.com', 'path' => '/my_path') );
+                $blog = get_blog_details( $blog_id );
+                $this->assertEquals( '/my_path/', $blog->path );
+
+                $result = update_blog_details( $blog_id, array('domain' => 'example.com', 'path' => 'multiple/dirs') );
+                $blog = get_blog_details( $blog_id );
+                $this->assertEquals( '/multiple/dirs/', $blog->path );
+
+                $result = update_blog_details( $blog_id, array('domain' => 'example.com', 'path' => 'multiple///dirs') );
+                $blog = get_blog_details( $blog_id );
+                $this->assertEquals( '/multiple/dirs/', $blog->path );
+        }
+
+        /**
          * Test cached data for a site that does not exist and then again after it exists.
          *
          * @ticket 23405