Changes from tags/1.2.6/bp-friends.php at r3297 to branches/1.2/bp-friends.php at r3111

File:

• branches/1.2/bp-friends.php (modified) (11 diffs, 1 prop)

branches/1.2/bp-friends.php

@@ -27 +27 @@
                ) {$charset_collate};";
 
-    require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+    require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
     dbDelta($sql);
 
@@ -34 +34 @@
 
 function friends_setup_globals() {
-    global $bp;
+    global $bp, $wpdb;
 
     /* For internal identification */
     $bp->friends->id = 'friends';
 
+    $bp->friends->table_name = $wpdb->base_prefix . 'bp_friends';
+    $bp->friends->format_notification_function = 'friends_format_notifications';
     $bp->friends->slug = BP_FRIENDS_SLUG;
-
-    $bp->friends->table_name = $bp->table_prefix . 'bp_friends';
-
-    $bp->friends->format_notification_function = 'friends_format_notifications';
 
     /* Register this in the active components array */
@@ -53 +51 @@
 
 function friends_check_installed() {
-    global $bp;
-
-    if ( !is_super_admin() )
+    global $wpdb, $bp;
+
+    if ( !is_site_admin() )
         return false;
 
@@ -158 +156 @@
                 <td></td>
                 <td><?php _e( 'A member sends you a friendship request', 'buddypress' ) ?></td>
-                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_friends_friendship_request', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_friends_friendship_request', true ) ) { ?>checked="checked" <?php } ?>/></td>
-                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php if ( get_user_meta( $current_user->id, 'notification_friends_friendship_request', true ) == 'no' ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_request]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_request') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_request') ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_request]" value="no" <?php if ( get_usermeta( $current_user->id,'notification_friends_friendship_request') == 'no' ) { ?>checked="checked" <?php } ?>/></td>
             </tr>
             <tr>
                 <td></td>
                 <td><?php _e( 'A member accepts your friendship request', 'buddypress' ) ?></td>
-                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php if ( !get_user_meta( $current_user->id, 'notification_friends_friendship_accepted', true ) || 'yes' == get_user_meta( $current_user->id, 'notification_friends_friendship_accepted', true ) ) { ?>checked="checked" <?php } ?>/></td>
-                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php if ( 'no' == get_user_meta( $current_user->id, 'notification_friends_friendship_accepted', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="yes"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="yes" <?php if ( !get_usermeta( $current_user->id,'notification_friends_friendship_accepted') || 'yes' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_friends_friendship_accepted]" value="no" <?php if ( 'no' == get_usermeta( $current_user->id,'notification_friends_friendship_accepted') ) { ?>checked="checked" <?php } ?>/></td>
             </tr>
 
@@ -283 +281 @@
         'item_id' => false,
         'secondary_item_id' => false,
-        'recorded_time' => bp_core_current_time(),
+        'recorded_time' => gmdate( "Y-m-d H:i:s" ),
         'hide_sitewide' => false
     );
@@ -364 +362 @@
     $friendship->is_confirmed = 0;
     $friendship->is_limited = 0;
-    $friendship->date_created = bp_core_current_time();
+    $friendship->date_created = time();
 
     if ( $force_accept )
@@ -418 +416 @@
         friends_update_friend_totals( $friendship->initiator_user_id, $friendship->friend_user_id );
 
-        // Remove the friend request notice
+        /* Remove the friend request notice */
         bp_core_delete_notifications_for_user_by_item_id( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_request' );
 
-        // Add a friend accepted notice for the initiating user
+        /* Add a friend accepted notice for the initiating user */
         bp_core_add_notification( $friendship->friend_user_id, $friendship->initiator_user_id, $bp->friends->id, 'friendship_accepted' );
 
@@ -427 +425 @@
         $friend_link = bp_core_get_userlink( $friendship->friend_user_id );
 
-        // Record in activity streams for the initiator
+        /* Record in activity streams for the initiator */
         friends_record_activity( array(
-            'user_id'           => $friendship->initiator_user_id,
-            'type'              => 'friendship_created',
-            'action'            => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%s and %s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ),
-            'item_id'           => $friendship_id,
-            'secondary_item_id' => $friendship->friend_user_id
+            'user_id' => $friendship->initiator_user_id,
+            'type' => 'friendship_created',
+            'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%s and %s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ),
+            'item_id' => $friendship_id
         ) );
 
-        // Record in activity streams for the friend
+        /* Record in activity streams for the friend */
         friends_record_activity( array(
-            'user_id'           => $friendship->friend_user_id,
-            'type'              => 'friendship_created',
-            'action'            => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%s and %s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ),
-            'item_id'           => $friendship_id,
-            'secondary_item_id' => $friendship->initiator_user_id,
-            'hide_sitewide'     => true // We've already got the first entry site wide
+            'user_id' => $friendship->friend_user_id,
+            'type' => 'friendship_created',
+            'action' => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%s and %s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ),
+            'item_id' => $friendship_id,
+            'hide_sitewide' => true /* We've already got the first entry site wide */
         ) );
 
-        // Send the email notification
+        /* Send the email notification */
         require_once( BP_PLUGIN_DIR . '/bp-friends/bp-friends-notifications.php' );
         friends_notification_accepted_request( $friendship->id, $friendship->initiator_user_id, $friendship->friend_user_id );
@@ -492 +488 @@
 
     if ( !$count = wp_cache_get( 'bp_total_friend_count_' . $user_id, 'bp' ) ) {
-        $count = get_user_meta( $user_id, 'total_friend_count', true );
+        $count = get_usermeta( $user_id, 'total_friend_count' );
         if ( empty( $count ) ) $count = 0;
         wp_cache_set( 'bp_total_friend_count_' . $user_id, $count, 'bp' );
@@ -595 +591 @@
 function friends_update_friend_totals( $initiator_user_id, $friend_user_id, $status = 'add' ) {
     if ( 'add' == $status ) {
-        update_user_meta( $initiator_user_id, 'total_friend_count', (int)get_user_meta( $initiator_user_id, 'total_friend_count', true ) + 1 );
-        update_user_meta( $friend_user_id, 'total_friend_count', (int)get_user_meta( $friend_user_id, 'total_friend_count', true ) + 1 );
+        update_usermeta( $initiator_user_id, 'total_friend_count', (int)get_usermeta( $initiator_user_id, 'total_friend_count' ) + 1 );
+        update_usermeta( $friend_user_id, 'total_friend_count', (int)get_usermeta( $friend_user_id, 'total_friend_count' ) + 1 );
     } else {
-        update_user_meta( $initiator_user_id, 'total_friend_count', (int)get_user_meta( $initiator_user_id, 'total_friend_count', true ) - 1 );
-        update_user_meta( $friend_user_id, 'total_friend_count', (int)get_user_meta( $friend_user_id, 'total_friend_count', true ) - 1 );
+        update_usermeta( $initiator_user_id, 'total_friend_count', (int)get_usermeta( $initiator_user_id, 'total_friend_count' ) - 1 );
+        update_usermeta( $friend_user_id, 'total_friend_count', (int)get_usermeta( $friend_user_id, 'total_friend_count' ) - 1 );
     }
 }
@@ -607 +603 @@
 
     /* Remove usermeta */
-    delete_user_meta( $user_id, 'total_friend_count' );
+    delete_usermeta( $user_id, 'total_friend_count' );
 
     /* Remove friendship requests FROM user */