← Back to branch summary

~canonical-sysadmins/wordpress/4.2.4

« back to all changes in this revision

Viewing changes to wp-includes/ms-functions.php

  • Committer: Dave Lawson
  • Date: 2015-08-10 14:35:56 UTC
  • Revision ID: dave.lawson@canonical.com-20150810143556-7i5p0omn6ei8jwlg
Merge 4.2.4 from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-includes/ms-functions.php
610
610
        if ( empty( $blogname ) )
611
611
                $errors->add('blogname', __( 'Please enter a site name.' ) );
612
612
 
613
 
        if ( preg_match( '/[^a-z0-9\.\-]+/', $blogname ) )
614
 
                $errors->add('blogname', __( 'Only lowercase letters (a-z), numbers, dash and period are allowed.' ) );
 
613
        if ( preg_match( '/[^a-z0-9]+/', $blogname ) )
 
614
                $errors->add('blogname', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
615
615
 
616
616
        if ( in_array( $blogname, $illegal_names ) == true )
617
617
                $errors->add('blogname',  __( 'That name is not allowed.' ) );