Changeset 866

Show
Ignore:
Timestamp:
01/24/07 13:23:19 (2 years ago)
Author:
donncha
Message:

Fixed path to activation page for user-only registrations (fixes #234)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-activate.php

    r797 r866  
    2727?> 
    2828<h2><?php _e('Activation Key Required') ?></h2> 
    29 <form name="activateform" id="activateform" method="post" action="/wp-activate.php"> 
     29<form name="activateform" id="activateform" method="post" action="<?php echo get_option( 'siteurl' ) ?>/wp-activate.php"> 
    3030<table border="0" width="100%" cellpadding="9"> 
    3131<tr> 

  • trunk/wp-includes/wpmu-functions.php

    r862 r866  
    10701070 
    10711071function wpmu_signup_user_notification($user, $user_email, $key, $meta = '') { 
     1072        global $current_site; 
    10721073        // Send email with activation link. 
    10731074        $admin_email = get_site_option( "admin_email" ); 
    …… 
    10751076                $admin_email = 'support@' . $_SERVER[ 'SERVER_NAME' ]; 
    10761077        $message_headers = "MIME-Version: 1.0\n" . "From: " . get_site_option( "site_name" ) .  " <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; 
    1077         $message = sprintf(__("To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n"), "http://{$_SERVER[ 'SERVER_NAME' ]}/wp-activate.php?key=$key" ); 
     1078        $message = sprintf(__("To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n"), "http://{$current_site->domain}{$current_site->path}/wp-activate.php?key=$key" ); 
    10781079        // TODO: Don't hard code activation link. 
    10791080        $subject = sprintf(__('Activate %s'), $user);