Changeset 40391

Timestamp:

04/07/2017 01:14:36 PM (7 years ago)

Author:

flixos90

Message:

Multisite: Partially revert [40295].

[40295] removed the restriction of a minimum amount of characters for new site names, which could cause unexpected behavior. That changeset is reverted here with the exception of the removal of the is_super_admin() check, which can safely be omitted. A new filter for the minimum site name length will be introduced later to be able to modify that behavior.

See #39676, #37616.

Location:

trunk

Files:

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

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

@@ -577 +577 @@
     if ( in_array( $blogname, $illegal_names ) )
         $errors->add('blogname',  __( 'That name is not allowed.' ) );
+
+    if ( strlen( $blogname ) < 4 ) {
+        $errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
+    }
 
     // do not allow users to create a blog that conflicts with a page on the main blog.

trunk/tests/phpunit/tests/multisite/wpmuValidateBlogSignup.php

@@ -65 +65 @@
             array( self::$existing_blog_name, 'Site names must not collide with an existing site name.' ),
             array( self::$existing_user_login, 'Site names must not collide with an existing user login.' ),
+            array( 'foo', 'Site names must at least contain 4 characters.' ),
         );
 
@@ -86 +87 @@
         $this->assertEmpty( $result['errors']->get_error_codes() );
     }
-
-    /**
-     * @ticket 39676
-     */
-    public function test_validate_short_blogname() {
-        $result = wpmu_validate_blog_signup( 'foo', 'Foo Site Title', get_userdata( self::$super_admin_id ) );
-        $this->assertEmpty( $result['errors']->get_error_codes() );
-    }
 }