WordPress 3.8

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

diff --git a/wp-activate.php b/wp-activate.php
index d470772ff6aacf7a2c6767e72c2290a761ef37d0..226780c34ea816d0dda5df7e87f0af59874fabba 100644 (file)
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -1,10 +1,17 @@
 <?php
 <?php

+/**
+ * Confirms that the activation key that is sent in an email after a user signs
+ * up for a new blog matches the key for that user and then displays confirmation.
+ *
+ * @package WordPress
+ */
+

 define( 'WP_INSTALLING', true );
 
 /** Sets up the WordPress Environment. */
 require( dirname(__FILE__) . '/wp-load.php' );
 
 define( 'WP_INSTALLING', true );
 
 /** Sets up the WordPress Environment. */
 require( dirname(__FILE__) . '/wp-load.php' );
 

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

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


@@ -14,13 +21,36 @@ if ( !is_multisite() ) {
 if ( is_object( $wp_object_cache ) )
        $wp_object_cache->cache_enabled = false;
 
 if ( is_object( $wp_object_cache ) )
        $wp_object_cache->cache_enabled = false;
 

+// Fix for page title
+$wp_query->is_404 = false;
+
+/**
+ * Fires before the Site Activation page is loaded.
+ *
+ * @since 3.0
+ */

 do_action( 'activate_header' );
 
 do_action( 'activate_header' );
 

+/**
+ * Adds an action hook specific to this page that fires on wp_head
+ *
+ * @since MU
+ */

 function do_activate_header() {
 function do_activate_header() {

-       do_action( 'activate_wp_head' );
+    /**
+     * Fires before the Site Activation page is loaded, but on the wp_head action.
+     *
+     * @since 3.0
+     */
+    do_action( 'activate_wp_head' );

 }
 add_action( 'wp_head', 'do_activate_header' );
 
 }
 add_action( 'wp_head', 'do_activate_header' );
 

+/**
+ * Loads styles specific to this page.
+ *
+ * @since MU
+ */

 function wpmu_activate_stylesheet() {
        ?>
        <style type="text/css">
 function wpmu_activate_stylesheet() {
        ?>
        <style type="text/css">


@@ -77,7 +107,7 @@ get_header();
                } else {
                        extract($result);
                        $url = get_blogaddress_by_id( (int) $blog_id);
                } else {
                        extract($result);
                        $url = get_blogaddress_by_id( (int) $blog_id);

-                       $user = new WP_User( (int) $user_id);
+                       $user = get_userdata( (int) $user_id);

                        ?>
                        <h2><?php _e('Your account is now active!'); ?></h2>
 
                        ?>
                        <h2><?php _e('Your account is now active!'); ?></h2>
 


@@ -99,4 +129,4 @@ get_header();
        var key_input = document.getElementById('key');
        key_input && key_input.focus();
 </script>
        var key_input = document.getElementById('key');
        key_input && key_input.focus();
 </script>

-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>