Changeset 2703

Timestamp:

12/06/2010 05:01:09 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Improve current_user_id and displayed_user_id functions. Also remove Page Template ability from User templates.

Location:

branches/plugin

Files:

• bbp-includes/bbp-user-template.php (modified) (3 diffs)
• bbp-themes/bbp-twentyten/user-edit.php (modified) (1 diff)
• bbp-themes/bbp-twentyten/user.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-user-template.php

@@ -269 +269 @@
         global $bbp;
 
-        return apply_filters( 'bbp_get_current_user_id', $bbp->current_user->ID );
+        $retval = isset( $bbp->current_user ) ? $bbp->current_user->ID : 0;
+
+        return apply_filters( 'bbp_get_current_user_id', $retval );
     }
 
@@ -294 +296 @@
         global $bbp;
 
-        if ( !isset( $bbp->displayed_user ) )
-            bbp_set_displayed_user();
-
-        return apply_filters( 'bbp_get_displayed_user_id', $bbp->displayed_user->ID );
+        $retval = isset( $bbp->displayed_user ) ? $bbp->displayed_user->ID : 0;
+
+        return apply_filters( 'bbp_get_displayed_user_id', $retval );
     }
 
@@ -450 +451 @@
         global $wp_rewrite, $bbp;
 
+        // Use displayed user ID if there is one, and one isn't requested
         if ( empty( $user_id ) )
-            $user_id = $bbp->displayed_user->ID;
+            $user_id = isset( $bbp->displayed_user ) ? $bbp->displayed_user->ID : 0;
 
         $url = !empty( $wp_rewrite->permalink_structure ) ? $wp_rewrite->front . $bbp->user_slug . '/%bbp_user%' : '';

branches/plugin/bbp-themes/bbp-twentyten/user-edit.php

@@ -1 +1 @@
 <?php
 /**
- * Template Name: bbPress - Edit User Profile
+ * bbPress user profile edit
  *
  * @package bbPress

branches/plugin/bbp-themes/bbp-twentyten/user.php

@@ -1 +1 @@
 <?php
 /**
- * Template Name: bbPress - User Profile
+ * bbPress user profile
  *
  * @package bbPress