WordPress.org

Make WordPress Core

Ticket #19724: wp-3.3-idn-signup.txt

File wp-3.3-idn-signup.txt, 1.8 KB (added by qdinar, 3 years ago)
Line 
1diff -r installer/wordpress-3.3/wp-admin/network/settings.php /var/www/saytlar/blogo/wp-admin/network/settings.php
268c68
3<                       if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
4---
5>                       if ( ! preg_match( '/(\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
681c81
7<                       if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
8---
9>                       if ( ! preg_match( '/(\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
10diff -r installer/wordpress-3.3/wp-admin/network/site-new.php /var/www/saytlar/blogo/wp-admin/network/site-new.php
11130c130
12<                       echo '<p>' . __( 'Only the characters a-z and 0-9 recommended.' ) . '</p>';
13---
14>                       echo '<p>' . __( 'Only letters, digits and dashes are recommended.' ) . '</p>';
15
16diff -r installer/wordpress-3.3/wp-includes/ms-functions.php /var/www/saytlar/blogo/wp-includes/ms-functions.php
17566c566
18<       if ( preg_match( '/[^a-z0-9]+/', $blogname ) )
19---
20>       if ( preg_match( '/[^a-z0-9-]+/', $blogname ) )
21
22diff -r installer/wordpress-3.3/wp-signup.php /var/www/saytlar/blogo/wp-signup.php
2376c76
24<               echo '<input name="blogname" type="text" id="blogname" value="'.esc_attr($blogname).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '</span><br />';
25---
26>               echo '<input name="blogname" type="text" id="blogname" value="'.idn_to_unicode(esc_attr($blogname)).'" maxlength="60" /><span class="suffix_address">.' . ( $site_domain = idn_to_unicode( preg_replace( '|^www\.|', '', $current_site->domain ) ) ) . '</span><br />';
27130c130
28<       _e( '(Must be at least 4 characters, letters and numbers only.)' );
29---
30>       _e( '(Must be at least 4 characters, latin letters and numbers only.)' );
31376a377
32> $_POST['blogname']=idn_to_ascii($_POST['blogname']);