Changeset 2842 for trunk/bp-core.php

Timestamp:

03/12/2010 01:03:42 PM (15 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk

File:

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

trunk/bp-core.php

@@ -33 +33 @@
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-catchuri.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-classes.php' );
+require ( BP_PLUGIN_DIR . '/bp-core/bp-core-filters.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-cssjs.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-avatars.php' );
@@ -40 +41 @@
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-notifications.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-signup.php' );
-
-/* Multisite includes built in account activation support. */
-if ( bp_core_is_multisite() )
-    require ( BP_PLUGIN_DIR . '/bp-core/bp-core-activation.php' );
 
 /* If BP_DISABLE_ADMIN_BAR is defined, do not load the global admin bar. */
@@ -1664 +1661 @@
     update_site_option( 'illegal_names', $new );
 }
-
-/**
- * bp_core_email_from_name_filter()
- *
- * Sets the "From" name in emails sent to the name of the site and not "WordPress"
- *
- * @package BuddyPress Core
- * @uses get_blog_option() fetches the value for a meta_key in the wp_X_options table
- * @return The blog name for the root blog
- */
-function bp_core_email_from_name_filter() {
-    return apply_filters( 'bp_core_email_from_name_filter', get_blog_option( BP_ROOT_BLOG, 'blogname' ) );
-}
-add_filter( 'wp_mail_from_name', 'bp_core_email_from_name_filter' );
-
-
-/**
- * bp_core_email_from_name_filter()
- *
- * Sets the "From" address in emails sent
- *
- * @package BuddyPress Core
- * @global $current_site Object containing current site metadata
- * @return noreply@sitedomain email address
- */
-function bp_core_email_from_address_filter() {
-    $domain = (array) explode( '/', site_url() );
-
-    return apply_filters( 'bp_core_email_from_address_filter', __( 'noreply', 'buddypress' ) . '@' . $domain[2] );
-}
-add_filter( 'wp_mail_from', 'bp_core_email_from_address_filter' );
 
 /**
@@ -1972 +1938 @@
 
 /**
- * bp_core_filter_parent_theme()
- *
- * Remove social network parent theme from the theme list.
- *
- * @package BuddyPress Core
- */
-function bp_core_filter_parent_theme() {
-    global $wp_themes, $pagenow;
-
-    if ( is_admin() && 'themes.php' == $pagenow )
-        $wp_themes = get_themes();
-
-    unset( $wp_themes['BuddyPress Classic Parent'] );
-}
-add_filter( 'admin_menu', 'bp_core_filter_parent_theme' );
-
-/**
- * bp_core_allow_default_theme()
- *
- * On multiblog installations you must first allow themes to be activated and show
- * up on the theme selection screen. This function will let the BuddyPress bundled
- * themes show up on the root blog selection screen and bypass this step. It also
- * means that the themes won't show for selection on other blogs.
- *
- * @package BuddyPress Core
- */
-function bp_core_allow_default_theme( $themes ) {
-    global $bp, $current_blog;
-
-    if ( !is_site_admin() )
-        return $themes;
-
-    if ( $current_blog->ID == $bp->root_blog ) {
-        $themes['bp-default'] = 1;
-        $themes['bp-classic'] = 1;
-    }
-
-    return $themes;
-}
-add_filter( 'allowed_themes', 'bp_core_allow_default_theme' );
-
-/**
  * bp_core_activation_notice()
  *
@@ -2054 +1978 @@
 add_action( 'admin_notices', 'bp_core_activation_notice' );
 
-/**
- * bp_core_filter_comments()
- *
- * Filter the blog post comments array and insert BuddyPress URLs for users.
- *
- * @package BuddyPress Core
- */
-function bp_core_filter_comments( $comments, $post_id ) {
-    global $wpdb;
-
-    foreach( (array)$comments as $comment ) {
-        if ( $comment->user_id )
-            $user_ids[] = $comment->user_id;
-    }
-
-    if ( empty( $user_ids ) )
-        return $comments;
-
-    $user_ids = implode( ',', $user_ids );
-
-    if ( !$userdata = $wpdb->get_results( $wpdb->prepare( "SELECT ID as user_id, user_login, user_nicename FROM {$wpdb->users} WHERE ID IN ({$user_ids})" ) ) )
-        return $comments;
-
-    foreach( (array)$userdata as $user )
-        $users[$user->user_id] = bp_core_get_user_domain( $user->user_id, $user->user_nicename, $user->user_login );
-
-    foreach( (array)$comments as $i => $comment ) {
-        if ( !empty( $comment->user_id ) ) {
-            if ( !empty( $users[$comment->user_id] ) )
-                $comments[$i]->comment_author_url = $users[$comment->user_id];
-        }
-    }
-
-    return $comments;
-}
-add_filter( 'comments_array', 'bp_core_filter_comments', 10, 2 );
-
-/**
- * bp_core_login_redirect()
- *
- * When a user logs in, always redirect them back to the previous page. NOT the admin area.
- *
- * @package BuddyPress Core
- */
-function bp_core_login_redirect( $redirect_to ) {
-    global $bp, $current_blog;
-
-    if ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
-        return $redirect_to;
-
-    if ( !empty( $_REQUEST['redirect_to'] ) || strpos( $_REQUEST['redirect_to'], 'wp-admin' ) )
-        return $redirect_to;
-
-    if ( false === strpos( wp_get_referer(), 'wp-login.php' ) && false === strpos( wp_get_referer(), 'activate' ) && empty( $_REQUEST['nr'] ) )
-        return wp_get_referer();
-
-    return $bp->root_domain;
-}
-add_filter( 'login_redirect', 'bp_core_login_redirect' );
-
-
 /********************************************************************************
  * Custom Actions