Changeset 2343

Timestamp:

01/18/2010 08:00:33 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Remove all references to Wire component (addresses #1618). This code has been moved to backpat.

Location:

trunk

Files:

• bp-activity.php (modified) (2 diffs)
• bp-core.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (7 diffs)
• bp-groups.php (modified) (11 diffs)
• bp-groups/bp-groups-classes.php (modified) (1 diff)
• bp-groups/bp-groups-notifications.php (modified) (1 diff)
• bp-groups/bp-groups-templatetags.php (modified) (2 diffs)
• bp-xprofile.php (modified) (8 diffs)
• bp-xprofile/bp-xprofile-notifications.php (deleted)

trunk/bp-activity.php

@@ -396 +396 @@
          *  'user_id' => false, // user_id to filter on
          *  'object' => false, // object to filter on e.g. groups, profile, status, friends
-         *  'action' => false, // action to filter on e.g. new_wire_post, new_forum_post, profile_updated
+         *  'action' => false, // action to filter on e.g. new_wire_post, profile_updated
          *  'primary_id' => false, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
          *  'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
@@ -438 +438 @@
 
         'user_id' => $bp->loggedin_user->id, // Optional: The user to record the activity for, can be false if this activity is not for a user.
-        'item_id' => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id, or wire_post_id
+        'item_id' => false, // Optional: The ID of the specific item being recorded, e.g. a blog_id
         'secondary_item_id' => false, // Optional: A second ID used to further filter e.g. a comment_id
         'recorded_time' => time(), // The time that this activity was recorded

trunk/bp-core.php

@@ -342 +342 @@
      */
     if ( !function_exists( 'xprofile_install' ) ) {
-        /* Fallback wire values if xprofile is disabled */
+        /* Fallback values if xprofile is disabled */
         $bp->core->profile->slug = 'profile';
         $bp->active_components[$bp->core->profile->slug] = $bp->core->profile->slug;

trunk/bp-core/bp-core-templatetags.php

@@ -1035 +1035 @@
 }
 
-function bp_profile_wire_can_post() {
-    global $bp;
-
-    if ( bp_is_home() )
-        return true;
-
-    if ( function_exists('friends_install') ) {
-        if ( friends_check_friendship( $bp->loggedin_user->id, $bp->displayed_user->id ) )
-            return true;
-        else
-            return false;
-    }
-
-    return true;
-}
-
 function bp_nav_items() {
     global $bp;
@@ -1395 +1379 @@
 }
 
-function bp_is_wire_component() {
-    global $bp;
-
-    if ( BP_WIRE_SLUG == $bp->current_action || in_array( BP_WIRE_SLUG, (array)$bp->action_variables ) )
-        return true;
-
-    return false;
-}
-
 function bp_is_messages_component() {
     global $bp;
@@ -1503 +1478 @@
 }
 
-function bp_is_profile_wire() {
-    global $bp;
-
-    if ( BP_XPROFILE_SLUG == $bp->current_component && 'wire' == $bp->current_action )
-        return true;
-
-    return false;
-}
-
 function bp_is_user_groups() {
     global $bp;
@@ -1553 +1519 @@
 
     if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'admin' == $bp->current_action )
-        return true;
-
-    return false;
-}
-
-function bp_is_group_wire() {
-    global $bp;
-
-    if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'wire' == $bp->current_action )
         return true;
 
@@ -1796 +1753 @@
             $bp_classes[] = 'blogs';
 
-        if ( bp_is_wire_component() && !bp_is_blog_page()  )
-            $bp_classes[] = 'wire';
-
         if ( bp_is_messages_component() && !bp_is_blog_page()  )
             $bp_classes[] = 'messages';
@@ -1865 +1819 @@
             $bp_classes[] = 'group-forum';
 
-        if ( bp_is_group_wire() )
-            $bp_classes[] = 'group-wire';
-
         if ( bp_is_group_admin_page() )
             $bp_classes[] = 'group-admin';
@@ -1876 +1827 @@
         if ( bp_is_group_home() )
             $bp_classes[] = 'group-home';
-
-        if ( bp_is_profile_wire() )
-            $bp_classes[] = 'profile-wire';
 
         if ( bp_is_change_avatar() )

trunk/bp-groups.php

@@ -24 +24 @@
             slug varchar(100) NOT NULL,
             description longtext NOT NULL,
-            news longtext NOT NULL,
             status varchar(10) NOT NULL DEFAULT 'public',
-            enable_wire tinyint(1) NOT NULL DEFAULT '1',
             enable_forum tinyint(1) NOT NULL DEFAULT '1',
             date_created datetime NOT NULL,
@@ -66 +64 @@
     dbDelta($sql);
 
-    if ( function_exists('bp_wire_install') )
-        groups_wire_install();
+    do_action( 'groups_install' );
 
     update_site_option( 'bp-groups-db-version', BP_GROUPS_DB_VERSION );
-}
-
-function groups_wire_install() {
-    global $wpdb, $bp;
-
-    if ( !empty($wpdb->charset) )
-        $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-
-    $sql[] = "CREATE TABLE {$bp->groups->table_name_wire} (
-            id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-            item_id bigint(20) NOT NULL,
-            user_id bigint(20) NOT NULL,
-            parent_id bigint(20) NOT NULL,
-            content longtext NOT NULL,
-            date_posted datetime NOT NULL,
-            KEY item_id (item_id),
-            KEY user_id (user_id),
-            KEY parent_id (parent_id)
-           ) {$charset_collate};";
-
-    require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
-    dbDelta($sql);
 }
 
@@ -108 +83 @@
     /* Register this in the active components array */
     $bp->active_components[$bp->groups->slug] = $bp->groups->id;
-
-    if ( function_exists('bp_wire_install') )
-        $bp->groups->table_name_wire = $wpdb->base_prefix . 'bp_groups_wire';
 
     $bp->groups->forbidden_names = apply_filters( 'groups_forbidden_names', array( 'my-groups', 'group-finder', 'create', 'invites', 'delete', 'add', 'admin', 'request-membership' ) );
@@ -239 +211 @@
                 bp_core_new_subnav_item( array( 'name' => __( 'Forum', 'buddypress' ), 'slug' => 'forum', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_forum', 'position' => 40, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'forums' ) );
 
-            if ( $bp->groups->current_group->enable_wire && function_exists('bp_wire_install') )
-                bp_core_new_subnav_item( array( 'name' => __( 'Wire', 'buddypress' ), 'slug' => BP_WIRE_SLUG, 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_wire', 'position' => 50, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'wire'  ) );
-
             bp_core_new_subnav_item( array( 'name' => __( 'Members', 'buddypress' ), 'slug' => 'members', 'parent_url' => $group_link, 'parent_slug' => $bp->groups->slug, 'screen_function' => 'groups_screen_group_members', 'position' => 60, 'user_has_access' => $bp->groups->current_group->user_has_access, 'item_css_id' => 'members'  ) );
 
@@ -593 +562 @@
 
             bp_core_load_template( apply_filters( 'groups_template_group_forum', 'groups/single/home' ) );
-        }
-    }
-}
-
-function groups_screen_group_wire() {
-    global $bp;
-
-    $wire_action = $bp->action_variables[0];
-
-    if ( $bp->is_single_item ) {
-        if ( 'post' == $wire_action && ( is_site_admin() || groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) ) {
-            /* Check the nonce first. */
-            if ( !check_admin_referer( 'bp_wire_post' ) )
-                return false;
-
-            if ( !groups_new_wire_post( $bp->groups->current_group->id, $_POST['wire-post-textarea'] ) )
-                bp_core_add_message( __('Wire message could not be posted.', 'buddypress'), 'error' );
-            else
-                bp_core_add_message( __('Wire message successfully posted.', 'buddypress') );
-
-            if ( !strpos( wp_get_referer(), $bp->wire->slug ) )
-                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
-            else
-                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . $bp->wire->slug );
-
-        } else if ( 'delete' == $wire_action && ( is_site_admin() || groups_is_user_member( $bp->loggedin_user->id, $bp->groups->current_group->id ) ) ) {
-            $wire_message_id = $bp->action_variables[1];
-
-            /* Check the nonce first. */
-            if ( !check_admin_referer( 'bp_wire_delete_link' ) )
-                return false;
-
-            if ( !groups_delete_wire_post( $wire_message_id, $bp->groups->table_name_wire ) )
-                bp_core_add_message( __('There was an error deleting the wire message.', 'buddypress'), 'error' );
-            else
-                bp_core_add_message( __('Wire message successfully deleted.', 'buddypress') );
-
-            if ( !strpos( wp_get_referer(), $bp->wire->slug ) )
-                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) );
-            else
-                bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . $bp->wire->slug );
-
-        } else if ( ( !$wire_action || 'latest' == $bp->action_variables[1] ) ) {
-            bp_core_load_template( apply_filters( 'groups_template_group_wire', 'groups/single/wire' ) );
-        } else {
-            bp_core_load_template( apply_filters( 'groups_template_group_home', 'groups/single/home' ) );
         }
     }
@@ -1092 +1015 @@
             <td class="no"><input type="radio" name="notifications[notification_groups_group_updated]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_group_updated') ) { ?>checked="checked" <?php } ?>/></td>
         </tr>
-        <?php if ( function_exists('bp_wire_install') ) { ?>
-        <tr>
-            <td></td>
-            <td><?php _e( 'A member posts on the wire of a group you belong to', 'buddypress' ) ?></td>
-            <td class="yes"><input type="radio" name="notifications[notification_groups_wire_post]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_groups_wire_post') || 'yes' == get_usermeta( $current_user->id, 'notification_groups_wire_post') ) { ?>checked="checked" <?php } ?>/></td>
-            <td class="no"><input type="radio" name="notifications[notification_groups_wire_post]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_groups_wire_post') ) { ?>checked="checked" <?php } ?>/></td>
-        </tr>
-        <?php } ?>
         <tr>
             <td></td>
@@ -1390 +1305 @@
     bp_activity_set_action( $bp->groups->id, 'created_group', __( 'Created a group', 'buddypress' ) );
     bp_activity_set_action( $bp->groups->id, 'joined_group', __( 'Joined a group', 'buddypress' ) );
-    bp_activity_set_action( $bp->groups->id, 'new_wire_post', __( 'New group wire post', 'buddypress' ) );
     bp_activity_set_action( $bp->groups->id, 'new_forum_topic', __( 'New group forum topic', 'buddypress' ) );
     bp_activity_set_action( $bp->groups->id, 'new_forum_post', __( 'New group forum post', 'buddypress' ) );
@@ -1431 +1345 @@
     groups_update_groupmeta( $group_id, 'last_activity', time() );
 }
-add_action( 'groups_deleted_wire_post', 'groups_update_last_activity' );
-add_action( 'groups_new_wire_post', 'groups_update_last_activity' );
 add_action( 'groups_joined_group', 'groups_update_last_activity' );
 add_action( 'groups_leave_group', 'groups_update_last_activity' );
@@ -1579 +1491 @@
         $group = new BP_Groups_Group;
 
-    if ( $creator_id ) {
+    if ( $creator_id )
         $group->creator_id = $creator_id;
-    } else {
+    else
         $group->creator_id = $bp->loggedin_user->id;
-    }
 
     if ( isset( $name ) )
@@ -2012 +1923 @@
 
     return $activity_id;
-}
-
-/*** Group Wire [DEPRECATED] ****************************************************************/
-
-function groups_new_wire_post( $group_id, $content ) {
-    global $bp;
-
-    if ( !function_exists( 'bp_wire_new_post' ) )
-        return false;
-
-    if ( $wire_post = bp_wire_new_post( $group_id, $content, 'groups' ) ) {
-
-        /* Post an email notification if settings allow */
-        require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
-        groups_notification_new_wire_post( $group_id, $wire_post->id );
-
-        /* Record this in activity streams */
-        $activity_content = sprintf( __( '%s wrote on the wire of the group %s:', 'buddypress'), bp_core_get_userlink( $bp->loggedin_user->id ), '<a href="' . bp_get_group_permalink( $bp->groups->current_group ) . '">' . attribute_escape( $bp->groups->current_group->name ) . '</a>' );
-        $activity_content .= '<blockquote>' . bp_create_excerpt( $content ) . '</blockquote>';
-
-        groups_record_activity( array(
-            'content' => apply_filters( 'groups_activity_new_wire_post', $activity_content ),
-            'primary_link' => apply_filters( 'groups_activity_new_wire_post_primary_link', bp_get_group_permalink( $bp->groups->current_group ) ),
-            'component_action' => 'new_wire_post',
-            'item_id' => $bp->groups->current_group->id,
-            'secondary_item_id' => $wire_post->item_id
-        ) );
-
-        do_action( 'groups_new_wire_post', $group_id, $wire_post->id );
-
-        return true;
-    }
-
-    return false;
-}
-
-function groups_delete_wire_post( $wire_post_id, $table_name ) {
-    if ( bp_wire_delete_post( $wire_post_id, 'groups', $table_name ) ) {
-        /* Delete the activity stream item */
-        if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
-            bp_activity_delete_by_item_id( array( 'item_id' => $wire_post_id, 'component_name' => 'groups', 'component_action' => 'new_wire_post' ) );
-        }
-
-        do_action( 'groups_deleted_wire_post', $wire_post_id );
-        return true;
-    }
-
-    return false;
 }
 
@@ -2716 +2579 @@
 
 // List actions to clear super cached pages on, if super cache is installed
-add_action( 'groups_new_wire_post', 'bp_core_clear_cache' );
-add_action( 'groups_deleted_wire_post', 'bp_core_clear_cache' );
 add_action( 'groups_join_group', 'bp_core_clear_cache' );
 add_action( 'groups_leave_group', 'bp_core_clear_cache' );

trunk/bp-groups/bp-groups-classes.php

@@ -205 +205 @@
         }
 
-        // Delete the wire posts for this group if the wire is installed
-        if ( function_exists('bp_wire_install') ) {
-            BP_Wire_Post::delete_all_for_item( $this->id, $bp->groups->table_name_wire );
-        }
+        do_action( 'bp_groups_delete_group', $this );
 
         // Finally remove the group entry from the DB

trunk/bp-groups/bp-groups-notifications.php

@@ -1 +1 @@
 <?php
-
-function groups_notification_new_wire_post( $group_id, $wire_post_id ) {
-    global $bp;
-
-    if ( !isset( $_POST['wire-post-email-notify'] ) )
-        return false;
-
-    $wire_post = new BP_Wire_Post( $bp->groups->table_name_wire, $wire_post_id );
-    $group = new BP_Groups_Group( $group_id, false, true );
-
-    $poster_name = bp_core_get_user_displayname( $wire_post->user_id );
-    $poster_profile_link = bp_core_get_user_domain( $wire_post->user_id );
-
-    $subject = '[' . get_blog_option( BP_ROOT_BLOG, 'blogname' ) . '] ' . sprintf( __( 'New wire post on group: %s', 'buddypress' ), stripslashes( attribute_escape( $group->name ) ) );
-
-    foreach ( $group->user_dataset as $user ) {
-        if ( 'no' == get_usermeta( $user->user_id, 'notification_groups_wire_post' ) ) continue;
-
-        $ud = get_userdata( $user->user_id );
-
-        // Set up and send the message
-        $to = $ud->user_email;
-
-        $wire_link = site_url( $bp->groups->slug . '/' . $group->slug . '/wire/' );
-        $group_link = site_url( $bp->groups->slug . '/' . $group->slug . '/' );
-        $settings_link = bp_core_get_user_domain( $user->user_id ) . 'settings/notifications/';
-
-        $message = sprintf( __(
-'%s posted on the wire of the group "%s":
-
-"%s"
-
-To view the group wire: %s
-
-To view the group home: %s
-
-To view %s\'s profile page: %s
-
----------------------
-', 'buddypress' ), $poster_name, stripslashes( attribute_escape( $group->name ) ), stripslashes($wire_post->content), $wire_link, $group_link, $poster_name, $poster_profile_link );
-
-        $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
-
-        // Send it
-        wp_mail( $to, $subject, $message );
-
-        unset( $message, $to );
-    }
-}
 
 function groups_notification_group_updated( $group_id ) {

trunk/bp-groups/bp-groups-templatetags.php

@@ -711 +711 @@
     }
 
-function bp_group_show_wire_setting( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    if ( $group->enable_wire )
-        echo ' checked="checked"';
-}
-
-function bp_group_is_wire_enabled( $group = false ) {
-    global $groups_template;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    if ( $group->enable_wire )
-        return true;
-
-    return false;
-}
-
 function bp_group_forum_permalink( $deprecated = false ) {
     echo bp_get_group_forum_permalink();
@@ -1613 +1591 @@
         global $bp;
         return apply_filters( 'bp_get_new_group_news', $bp->groups->current_group->news );
-    }
-
-function bp_new_group_enable_wire() {
-    echo bp_get_new_group_enable_wire();
-}
-    function bp_get_new_group_enable_wire() {
-        global $bp;
-        return (int) apply_filters( 'bp_get_new_group_enable_wire', $bp->groups->current_group->enable_wire );
     }
 

trunk/bp-xprofile.php

@@ -10 +10 @@
 require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-filters.php' );
 require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-templatetags.php' );
-require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-notifications.php' );
 require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-cssjs.php' );
 
@@ -90 +89 @@
     dbDelta($sql);
 
-    if ( function_exists('bp_wire_install') )
-        xprofile_wire_install();
+    do_action( 'xprofile_install' );
 
     update_site_option( 'bp-xprofile-db-version', BP_XPROFILE_DB_VERSION );
-}
-
-function xprofile_wire_install() {
-    global $bp, $wpdb;
-
-    if ( !empty($wpdb->charset) )
-        $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-
-    $sql[] = "CREATE TABLE {$bp->profile->table_name_wire} (
-               id bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-               item_id bigint(20) NOT NULL,
-               user_id bigint(20) NOT NULL,
-               parent_id bigint(20) NOT NULL,
-               content longtext NOT NULL,
-               date_posted datetime NOT NULL,
-               KEY item_id (item_id),
-               KEY user_id (user_id),
-               KEY parent_id (parent_id)
-               ) {$charset_collate};";
-
-    require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
-    dbDelta($sql);
 }
 
@@ -146 +122 @@
     /* Set the support field type ids */
     $bp->profile->field_types = apply_filters( 'xprofile_field_types', array( 'textbox', 'textarea', 'radio', 'checkbox', 'selectbox', 'multiselectbox', 'datebox' ) );
-
-    if ( function_exists( 'bp_wire_install' ) )
-        $bp->profile->table_name_wire = $wpdb->base_prefix . 'bp_xprofile_wire';
 
     do_action( 'xprofile_setup_globals' );
@@ -420 +393 @@
 }
 
-/**
- * xprofile_screen_notification_settings()
- *
- * Loads the notification settings for the xprofile component.
- * Settings are hooked into the function: bp_core_screen_notification_settings_content()
- * in bp-core/bp-core-settings.php
- *
- * @package BuddyPress Xprofile
- * @global $current_user WordPress global variable containing current logged in user information
- */
-function xprofile_screen_notification_settings() {
-    global $current_user; ?>
-    <?php if ( function_exists('bp_wire_install') ) { ?>
-    <table class="notification-settings" id="profile-notification-settings">
-        <tr>
-            <th class="icon"></th>
-            <th class="title"><?php _e( 'Profile', 'buddypress' ) ?></th>
-            <th class="yes"><?php _e( 'Yes', 'buddypress' ) ?></th>
-            <th class="no"><?php _e( 'No', 'buddypress' )?></th>
-        </tr>
-
-        <tr>
-            <td></td>
-            <td><?php _e( 'A member posts on your wire', 'buddypress' ) ?></td>
-            <td class="yes"><input type="radio" name="notifications[notification_profile_wire_post]" value="yes" <?php if ( !get_usermeta( $current_user->id, 'notification_profile_wire_post' ) || 'yes' == get_usermeta( $current_user->id, 'notification_profile_wire_post' ) ) { ?>checked="checked" <?php } ?>/></td>
-            <td class="no"><input type="radio" name="notifications[notification_profile_wire_post]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id, 'notification_profile_wire_post' ) ) { ?>checked="checked" <?php } ?>/></td>
-        </tr>
-
-        <?php do_action( 'xprofile_screen_notification_settings' ) ?>
-    </table>
-    <?php } ?>
-<?php
-}
-add_action( 'bp_notification_settings', 'xprofile_screen_notification_settings', 1 );
-
-
 /********************************************************************************
  * Action Functions
@@ -499 +436 @@
 add_action( 'wp', 'xprofile_action_delete_avatar', 3 );
 
-/**
- * xprofile_action_new_wire_post()
- *
- * Posts a new wire post to the users profile wire.
- *
- * @package BuddyPress XProfile
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses bp_wire_new_post() Adds a new wire post to a specific wire using the ID of the item passed and the table name.
- * @uses bp_core_add_message() Adds an error/success message to the session to be displayed on the next page load.
- * @uses bp_core_redirect() Safe redirects to a new page using the wp_redirect() function
- */
-function xprofile_action_new_wire_post() {
-    global $bp;
-
-    if ( $bp->current_component != $bp->wire->slug )
-        return false;
-
-    if ( 'post' != $bp->current_action )
-        return false;
-
-    /* Check the nonce */
-    if ( !check_admin_referer( 'bp_wire_post' ) )
-        return false;
-
-    if ( !$wire_post = bp_wire_new_post( $bp->displayed_user->id, $_POST['wire-post-textarea'], $bp->profile->id ) ) {
-        bp_core_add_message( __( 'Wire message could not be posted. Please try again.', 'buddypress' ), 'error' );
-    } else {
-        bp_core_add_message( __( 'Wire message successfully posted.', 'buddypress' ) );
-
-        /* Record the notification for the reciever if it's not on their own wire */
-        if ( !bp_is_home() )
-            bp_core_add_notification( $bp->loggedin_user->id, $bp->displayed_user->id, $bp->profile->id, 'new_wire_post' );
-
-        /* Record this on the poster's activity screen */
-        if ( ( $wire_post->item_id == $bp->loggedin_user->id && $wire_post->user_id == $bp->loggedin_user->id ) || ( $wire_post->item_id == $bp->displayed_user->id && $wire_post->user_id == $bp->displayed_user->id ) ) {
-            $from_user_link = bp_core_get_userlink($wire_post->user_id);
-            $content = sprintf( __('%s wrote on their own wire', 'buddypress'), $from_user_link ) . ': <span class="time-since">%s</span>';
-            $primary_link = bp_core_get_userlink( $wire_post->user_id, false, true );
-        } else if ( ( $wire_post->item_id != $bp->loggedin_user->id && $wire_post->user_id == $bp->loggedin_user->id ) || ( $wire_post->item_id != $bp->displayed_user->id && $wire_post->user_id == $bp->displayed_user->id ) ) {
-            $from_user_link = bp_core_get_userlink($wire_post->user_id);
-            $to_user_link = bp_core_get_userlink( $wire_post->item_id, false, false, true, true );
-            $content = sprintf( __('%s wrote on %s wire', 'buddypress'), $from_user_link, $to_user_link ) . ': <span class="time-since">%s</span>';
-            $primary_link = bp_core_get_userlink( $wire_post->item_id, false, true );
-        }
-
-        $content .= '<blockquote>' . bp_create_excerpt($wire_post->content) . '</blockquote>';
-
-        /* Now write the values */
-        xprofile_record_activity( array(
-            'user_id' => $bp->loggedin_user->id,
-            'content' => apply_filters( 'xprofile_activity_new_wire_post', $content, &$wire_post ),
-            'primary_link' => apply_filters( 'xprofile_activity_new_wire_post_primary_link', $primary_link ),
-            'component_action' => 'new_wire_post',
-            'item_id' => $wire_post->id
-        ) );
-
-        do_action( 'xprofile_new_wire_post', &$wire_post );
-    }
-
-    if ( !strpos( wp_get_referer(), $bp->wire->slug ) ) {
-        bp_core_redirect( $bp->displayed_user->domain );
-    } else {
-        bp_core_redirect( $bp->displayed_user->domain . $bp->wire->slug );
-    }
-}
-add_action( 'wp', 'xprofile_action_new_wire_post', 3 );
-
-/**
- * xprofile_action_delete_wire_post()
- *
- * Deletes a wire post from the users profile wire.
- *
- * @package BuddyPress XProfile
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses bp_wire_delete_post() Deletes a wire post for a specific wire using the ID of the item passed and the table name.
- * @uses xprofile_delete_activity() Deletes an activity item for the xprofile component and a particular user.
- * @uses bp_core_add_message() Adds an error/success message to the session to be displayed on the next page load.
- * @uses bp_core_redirect() Safe redirects to a new page using the wp_redirect() function
- */
-function xprofile_action_delete_wire_post() {
-    global $bp;
-
-    if ( $bp->current_component != $bp->wire->slug )
-        return false;
-
-    if ( $bp->current_action != 'delete' )
-        return false;
-
-    if ( !check_admin_referer( 'bp_wire_delete_link' ) )
-        return false;
-
-    $wire_post_id = $bp->action_variables[0];
-
-    if ( bp_wire_delete_post( $wire_post_id, $bp->profile->slug, $bp->profile->table_name_wire ) ) {
-        bp_core_add_message( __('Wire message successfully deleted.', 'buddypress') );
-
-        /* Delete the post from activity streams */
-        xprofile_delete_activity( array( 'item_id' => $wire_post_id, 'component_action' => 'new_wire_post' ) );
-
-        do_action( 'xprofile_delete_wire_post', $wire_post_id );
-    } else {
-        bp_core_add_message( __('Wire post could not be deleted, please try again.', 'buddypress'), 'error' );
-    }
-
-    if ( !strpos( wp_get_referer(), $bp->wire->slug ) ) {
-        bp_core_redirect( $bp->displayed_user->domain );
-    } else {
-        bp_core_redirect( $bp->displayed_user->domain. $bp->wire->slug );
-    }
-}
-add_action( 'wp', 'xprofile_action_delete_wire_post', 3 );
-
-
 /********************************************************************************
  * Activity & Notification Functions
@@ -628 +452 @@
     bp_activity_set_action( $bp->profile->id, 'new_member', __( 'New member registered', 'buddypress' ) );
     bp_activity_set_action( $bp->profile->id, 'updated_profile', __( 'Updated Profile', 'buddypress' ) );
-    bp_activity_set_action( $bp->profile->id, 'new_wire_post', __( 'New profile wire post', 'buddypress' ) );
 
     do_action( 'xprofile_register_activity_actions' );
@@ -696 +519 @@
 
     return apply_filters( 'xprofile_register_activity_action', bp_activity_set_action( $bp->profile->id, $key, $value ), $key, $value );
-}
-
-/**
- * xprofile_format_notifications()
- *
- * Format notifications into something that can be read and displayed
- *
- * @package BuddyPress Xprofile
- * @param $item_id The ID of the specific item for which the activity is recorded (could be a wire post id, user id etc)
- * @param $action The component action name e.g. 'new_wire_post' or 'updated_profile'
- * @param $total_items The total number of identical notification items (used for grouping)
- * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
- * @uses bp_core_global_user_fullname() Returns the display name for the user
- * @return The readable notification item
- */
-function xprofile_format_notifications( $action, $item_id, $secondary_item_id, $total_items ) {
-    global $bp;
-
-    if ( 'new_wire_post' == $action ) {
-        if ( (int)$total_items > 1 ) {
-            return apply_filters( 'bp_xprofile_multiple_new_wire_post_notification', '<a href="' . $bp->loggedin_user->domain . $bp->wire->slug . '" title="' . __( 'Wire', 'buddypress' ) . '">' . sprintf( __( 'You have %d new posts on your wire', 'buddypress' ), (int)$total_items ) . '</a>', $total_items );
-        } else {
-            $user_fullname = bp_core_get_user_displayname( $item_id );
-            return apply_filters( 'bp_xprofile_single_new_wire_post_notification', '<a href="' . $bp->loggedin_user->domain . $bp->wire->slug . '" title="' . __( 'Wire', 'buddypress' ) . '">' . sprintf( __( '%s posted on your wire', 'buddypress' ), $user_fullname ) . '</a>', $user_fullname );
-        }
-    }
-
-    do_action( 'xprofile_format_notifications', $action, $item_id, $secondary_item_id, $total_items );
-
-    return false;
 }
 
@@ -1089 +882 @@
 
     bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->profile->id, 'new_at_mention' );
-    bp_core_delete_notifications_for_user_by_type( $bp->loggedin_user->id, $bp->profile->id, 'new_wire_post' );
-}
-add_action( 'bp_wire_screen_latest', 'xprofile_remove_screen_notifications' );
+}
 add_action( 'bp_activity_screen_my_activity', 'xprofile_remove_screen_notifications' );
 add_action( 'bp_activity_screen_single_activity_permalink', 'xprofile_remove_screen_notifications' );