Changeset 40295

Timestamp:

03/17/2017 02:35:08 PM (7 years ago)

Author:

flixos90

Message:

Multisite: Remove restriction of minimum site name length in wpmu_validate_blog_signup().

It is sometimes desirable to support shorter site names than 4 characters, therefore that restriction should be removed. It is still possible to manually enforce it by using the wpmu_validate_blog_signup filter.

As a result of this change, another is_super_admin() call gets removed which affects the ongoing efforts of working on a network-wide role system.

Props milindmore22.
Fixes #39676. See #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

@@ -576 +576 @@
     if ( in_array( $blogname, $illegal_names ) )
         $errors->add('blogname',  __( 'That name is not allowed.' ) );
-
-    if ( strlen( $blogname ) < 4 && !is_super_admin() )
-        $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

@@ -67 +67 @@
         );
 
-        if ( ! is_super_admin() ) {
-            $data[] = array( 'foo', 'Site names must at least contain 4 characters.' );
-        }
-
         $illegal_names = get_site_option( 'illegal_names' );
         if ( ! empty( $illegal_names ) ) {
@@ -90 +86 @@
         $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() );
+    }
 }