Changeset 2114 for trunk/bp-core/deprecated/bp-core-deprecated.php

Timestamp:

11/24/2009 10:05:01 PM (17 years ago)

Author:

apeatling

Message:

Merging 1.1 branch fixes into trunk.

File:

• trunk/bp-core/deprecated/bp-core-deprecated.php (modified) (2 diffs)

trunk/bp-core/deprecated/bp-core-deprecated.php

@@ -332 +332 @@
         $blog_title = $filtered_results['blog_title'];
         $errors = $filtered_results['errors'];
-        
+
         if ( empty($blogname) )
                 $blogname = $user_name;
@@ -567 +567 @@
         return false;
 }
-add_filter( 'wpmu_signup_blog_notification', 'bp_core_activation_signup_blog_notification', 1, 7 );
 
 function bp_core_activation_signup_user_notification( $user, $user_email, $key, $meta ) {
         global $current_site;
 
+        if( !apply_filters('wpmu_signup_user_notification', $user, $user_email, $key, $meta) )
+                return false;
+
         // Send email with activation link.
         $admin_email = get_site_option( "admin_email" );
 
-        if ( empty( $admin_email ) )
+        if ( $admin_email == '' )
                 $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
 
-        $from_name = ( '' == get_site_option( "site_name" ) ) ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
+        $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : wp_specialchars( get_site_option( "site_name" ) );
         $message_headers = "MIME-Version: 1.0\n" . "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
-        $message = apply_filters( 'wpmu_signup_user_notification_email', 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", 'buddypress' ), clean_url( bp_activation_page( false ) . "?key=$key" ) ) );
-        $subject = apply_filters( 'wpmu_signup_user_notification_subject', sprintf( __(  'Activate %s', 'buddypress' ), $user ) );
-
-        wp_mail( $user_email, $subject, $message, $message_headers );
+        $message = sprintf( apply_filters( 'wpmu_signup_user_notification_email', __( "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" ) ), site_url( "wp-activate.php?key=$key" ), $key );
+
+        // TODO: Don't hard code activation link.
+        $subject = sprintf(__( apply_filters( 'wpmu_signup_user_notification_subject', 'Activate %s' )), $user);
+        wp_mail($user_email, $subject, $message, $message_headers);
 
         // Return false to stop the original WPMU function from continuing
         return false;
 }
-add_filter( 'wpmu_signup_user_notification', 'bp_core_activation_signup_user_notification', 1, 4 );
+
+function bp_core_load_deprecated_signup_email_functions() {
+        /* If we are using a BuddyPress 1.1+ theme ignore this. */
+        if ( !file_exists( WP_CONTENT_DIR . '/bp-themes' ) )
+                return false;
+
+        add_filter( 'wpmu_signup_user_notification', 'bp_core_activation_signup_user_notification', 1, 4 );
+        add_filter( 'wpmu_signup_blog_notification', 'bp_core_activation_signup_blog_notification', 1, 7 );
+}
+add_action( 'plugins_loaded', 'bp_core_load_deprecated_signup_email_functions' );
 
 /*** END DEPRECATED SIGNUP FUNCTIONS **********/