Ticket #15554: diff304-blogo.txt

diff -r installer/wordpress-3.0.4/wp-admin/ms-edit.php oldsites/blogorf-12//wp-admin/ms-edit.php
54c54,55
<                               if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
---
>                               //if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
>                               if ( ! preg_match( '/(\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
67c68,69
<                               if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
---
>                               //if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
>                               if ( ! preg_match( '/(\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) )
80c82,83
<               } elseif ( ! preg_match( '/(--|\.)/', $_POST['dashboard_blog'] ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $_POST['dashboard_blog'] ) ) {
---
>               //} elseif ( ! preg_match( '/(--|\.)/', $_POST['dashboard_blog'] ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $_POST['dashboard_blog'] ) ) {
>               } elseif ( ! preg_match( '/(\.)/', $_POST['dashboard_blog'] ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $_POST['dashboard_blog'] ) ) {
149c152,153
<               if ( ! preg_match( '/(--)/', $blog['domain'] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
---
>               //if ( ! preg_match( '/(--)/', $blog['domain'] ) && preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )
>               if ( preg_match( '|^([a-zA-Z0-9-])+$|', $blog['domain'] ) )


diff -r installer/wordpress-3.0.4/wp-includes/ms-functions.php oldsites/blogorf-12//wp-includes/ms-functions.php
529c529,530
<       preg_match( '/[a-z0-9]+/', $blogname, $maybe );
---
>       //preg_match( '/[a-z0-9]+/', $blogname, $maybe );
>       preg_match( '/[a-z0-9-]+/', $blogname, $maybe );
548c549
<       preg_match( '/[0-9]*/', $blogname, $match );
---
>       preg_match( '/[0-9-]*/', $blogname, $match );




diff -r installer/wordpress-3.0.4/wp-signup.php oldsites/blogorf-12//wp-signup.php
72c72
<               echo '<label for="blogname">' . __('Site Domain:') . '</label>';
---
>               echo '<label for="blogname">' . __('Site Domain:') . '</label>кириллица белән язсагыз әйбәт булыр';
81c81,82
<               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 />';
---
>               //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 />';
>               echo '<input name="blogname" type="text" id="blogname" value="'.idn_to_unicode(esc_attr($blogname)).'" maxlength="60" /><span class="suffix_address">.' . idn_to_unicode( $site_domain = preg_replace( '|^www\.|', '', $current_site->domain ) ) . '</span><br />';
88c89,90
<                       print __( 'domain.' ) . $site_domain . $current_site->path;
---
>                       //print __( 'domain.' ) . $site_domain . $current_site->path;
>                       print __( 'domain.' ) . idn_to_unicode($site_domain) . $current_site->path;
131c133
<       echo '<label for="user_name">' . __('Username:') . '</label>';
---
>       echo '<label for="user_name">' . __('Username:') . '</label>моны кечкенә латин хәрефе һәм цифр белән язасы';
134a137
>       //$user_name=idn_to_utf8($user_name);
382a386,387
> $_POST['blogname']=idn_to_ascii($_POST['blogname']);
> 
435c440,441
<                               signup_user( $newblogname, $user_email );
---
>                               //signup_user( $newblogname, $user_email );
>                               signup_user( '', $user_email );