Wordpress 3.7

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

diff --git a/wp-activate.php b/wp-activate.php
index 6a474b12fb2bc7d43c0cc39d27efc1d0e1954e3b..226780c34ea816d0dda5df7e87f0af59874fabba 100644 (file)
--- a/wp-activate.php
+++ b/wp-activate.php
@@ -11,7 +11,7 @@ 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' ) );
@@ -21,6 +21,14 @@ if ( !is_multisite() ) {
 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' );
 
 /**
@@ -29,7 +37,12 @@ do_action( 'activate_header' );
  * @since MU
  */
 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' );
 
@@ -116,4 +129,4 @@ get_header();
        var key_input = document.getElementById('key');
        key_input && key_input.focus();
 </script>
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>