Changeset 2372 for trunk/bp-friends/bp-friends-templatetags.php

Timestamp:

01/19/2010 09:26:59 PM (15 years ago)

Author:

apeatling

Message:

Better friendship request usability.

File:

• trunk/bp-friends/bp-friends-templatetags.php (modified) (3 diffs)

trunk/bp-friends/bp-friends-templatetags.php

@@ -161 +161 @@
 }
 
-function bp_friend_accept_request_link() {
-    echo bp_get_friend_accept_request_link();
-}
-    // You only have the user ID but you need the friendship ID !!
-
-    function bp_get_friend_accept_request_link() {
+function bp_friend_friendship_id() {
+    echo bp_get_friend_friendship_id();
+}
+    function bp_get_friend_friendship_id() {
         global $members_template, $bp;
 
@@ -174 +172 @@
         }
 
-        return apply_filters( 'bp_get_friend_accept_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/accept/' . $friendship_id, 'friends_accept_friendship' ) );
-    }
-
-function bp_friend_reject_request_link() {
-    echo bp_get_friend_reject_request_link();
-}
-    function bp_get_friend_reject_request_link() {
+        return apply_filters( 'bp_get_friend_friendship_id', $friendship_id );
+    }
+
+function bp_friend_accept_request_link() {
+    echo bp_get_friend_accept_request_link();
+}
+    function bp_get_friend_accept_request_link() {
         global $members_template, $bp;
 
@@ -188 +186 @@
         }
 
+        return apply_filters( 'bp_get_friend_accept_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/accept/' . $friendship_id, 'friends_accept_friendship' ) );
+    }
+
+function bp_friend_reject_request_link() {
+    echo bp_get_friend_reject_request_link();
+}
+    function bp_get_friend_reject_request_link() {
+        global $members_template, $bp;
+
+        if ( !$friendship_id = wp_cache_get( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id ) ) {
+            $friendship_id = friends_get_friendship_id( $members_template->member->id, $bp->loggedin_user->id );
+            wp_cache_set( 'friendship_id_' . $members_template->member->id . '_' . $bp->loggedin_user->id, $friendship_id, 'bp' );
+        }
+
         return apply_filters( 'bp_get_friend_reject_request_link', wp_nonce_url( $bp->loggedin_user->domain . $bp->friends->slug . '/requests/reject/' . $friendship_id, 'friends_reject_friendship' ) );
     }