WordPress 3.3.2-scripts

[autoinstalls/wordpress.git] / wp-signup.php

diff --git a/wp-signup.php b/wp-signup.php
index cce20833e881fb130f11ac0ff1c916cd4423eea1..6fa1742f0d891d6ec30e0d34404bfab25b760681 100644 (file)
--- a/wp-signup.php
+++ b/wp-signup.php
@@ -3,7 +3,7 @@
 /** Sets up the WordPress Environment. */
 require( dirname(__FILE__) . '/wp-load.php' );
 
 /** Sets up the WordPress Environment. */
 require( dirname(__FILE__) . '/wp-load.php' );
 

-add_action( 'wp_head', 'signuppageheaders' ) ;
+add_action( 'wp_head', 'wp_no_robots' );

 
 require( './wp-blog-header.php' );
 
 
 require( './wp-blog-header.php' );
 


@@ -17,10 +17,6 @@ function do_signup_header() {
 }
 add_action( 'wp_head', 'do_signup_header' );
 
 }
 add_action( 'wp_head', 'do_signup_header' );
 

-function signuppageheaders() {
-       echo "<meta name='robots' content='noindex,nofollow' />\n";
-}
-

 if ( !is_multisite() ) {
        wp_redirect( site_url('wp-login.php?action=register') );
        die();
 if ( !is_multisite() ) {
        wp_redirect( site_url('wp-login.php?action=register') );
        die();


@@ -213,7 +209,7 @@ function validate_another_blog_signup() {
        $meta = apply_filters( 'signup_create_blog_meta', array( 'lang_id' => 1, 'public' => $public ) ); // deprecated
        $meta = apply_filters( 'add_signup_meta', $meta );
 
        $meta = apply_filters( 'signup_create_blog_meta', array( 'lang_id' => 1, 'public' => $public ) ); // deprecated
        $meta = apply_filters( 'add_signup_meta', $meta );
 

-       wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid );
+       wpmu_create_blog( $domain, $path, $blog_title, $current_user->ID, $meta, $wpdb->siteid );

        confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);
        return true;
 }
        confirm_another_blog_signup($domain, $path, $blog_title, $current_user->user_login, $current_user->user_email, $meta);
        return true;
 }