Changeset 40589

Timestamp:

05/09/2017 02:58:39 PM (8 years ago)

Author:

flixos90

Message:

Multisite: Introduce minimum_site_name_length filter.

Prior to this change, the minimum site name length checked in wpmu_validate_blog_signup() was set to a fixed value of 4. The new filter allows tweaking this value, as there may be cases where shorter site names may be required.

Fixes #39676.

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

@@ -578 +578 @@
         $errors->add('blogname',  __( 'That name is not allowed.' ) );
 
-    if ( strlen( $blogname ) < 4 ) {
-        $errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
+    /**
+     * Filters the minimum site name length required when validating a site signup.
+     *
+     * @since 4.8.0
+     *
+     * @param int $length The minimum site name length. Default 4.
+     */
+    $minimum_site_name_length = apply_filters( 'minimum_site_name_length', 4 );
+
+    if ( strlen( $blogname ) < $minimum_site_name_length ) {
+        /* translators: %s: minimum site name length */
+        $errors->add( 'blogname', sprintf( _n( 'Site name must be at least %s character.', 'Site name must be at least %s characters.', $minimum_site_name_length ), number_format_i18n( $minimum_site_name_length ) ) );
     }
 

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

@@ -14 +14 @@
     protected static $existing_blog_name = 'existingsitefoo';
     protected static $existing_blog_id;
+
+    protected $minimum_site_name_length = 4;
 
     public static function wpSetUpBeforeClass( $factory ) {
@@ -87 +89 @@
         $this->assertEmpty( $result['errors']->get_error_codes() );
     }
+
+    /**
+     * @ticket 39676
+     *
+     * @dataProvider data_filter_minimum_site_name_length
+     */
+    public function test_filter_minimum_site_name_length( $site_name, $minimum_length, $expect_error ) {
+        $this->minimum_site_name_length = $minimum_length;
+        add_filter( 'minimum_site_name_length', array( $this, 'filter_minimum_site_name_length' ) );
+
+        $result = wpmu_validate_blog_signup( $site_name, 'Site Title', get_userdata( self::$super_admin_id ) );
+
+        remove_filter( 'minimum_site_name_length', array( $this, 'filter_minimum_site_name_length' ) );
+        $this->minimum_site_name_length = 4;
+
+        if ( $expect_error ) {
+            $this->assertContains( 'blogname', $result['errors']->get_error_codes() );
+        } else {
+            $this->assertEmpty( $result['errors']->get_error_codes() );
+        }
+    }
+
+    public function data_filter_minimum_site_name_length() {
+        return array(
+            array( 'fooo', 5, true ),
+            array( 'foooo', 5, false ),
+            array( 'foo', 4, true ),
+            array( 'fooo', 4, false ),
+            array( 'fo', 3, true ),
+            array( 'foo', 3, false ),
+        );
+    }
+
+    public function filter_minimum_site_name_length() {
+        return $this->minimum_site_name_length;
+    }
 }