Changeset 2788

Timestamp:

01/09/2011 09:19:26 PM (16 years ago)

Author:

johnjamesjacoby

Message:

Better handling of title attributes. Props GautamGupta via Google Code-in

Location:

branches/plugin/bbp-includes

Files:

• bbp-forum-template.php (modified) (3 diffs)
• bbp-functions.php (modified) (3 diffs)
• bbp-hooks.php (modified) (2 diffs)
• bbp-reply-template.php (modified) (2 diffs)
• bbp-topic-template.php (modified) (2 diffs)

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

@@ -145 +145 @@
  * @param string $filter Optional Sanitation filter. See {@link sanitize_post()}
  * @uses get_post() To get the forum
+ * @uses apply_filters() Calls 'bbp_get_forum' with the forum, output type and
+ *                        sanitation filter
  * @return mixed Null if error or forum (in specified form) if success
  */
@@ -172 +174 @@
         }
 
-        return apply_filters( 'bbp_get_forum', $forum );
+        return apply_filters( 'bbp_get_forum', $forum, $output, $filter );
 }
 
@@ -352 +354 @@
  */
 function bbp_get_forum_ancestors( $forum_id = 0 ) {
-        $forum_id = bbp_get_forum_id( $forum_id );
+        $forum_id  = bbp_get_forum_id( $forum_id );
+        $ancestors = array();
 
         if ( $forum = bbp_get_forum( $forum_id ) ) {
-                $ancestors = array();
                 while ( 0 !== $forum->post_parent ) {
                         $ancestors[] = $forum->post_parent;

branches/plugin/bbp-includes/bbp-functions.php

@@ -1988 +1988 @@
 
 /**
- * Custom page title for bbPress User Profile Pages
- *
- * @since bbPress (r2688)
+ * Custom page title for bbPress pages
+ *
+ * @since bbPress (r2788)
  *
  * @param string $title Optional. The title (not used).
- * @param string $sep Optional, default is '»'. How to separate the various items within the page title.
+ * @param string $sep Optional, default is '»'. How to separate the
+ *                     various items within the page title.
  * @param string $seplocation Optional. Direction to display title, 'right'.
  * @uses bbp_is_user_profile_page() To check if it's a user profile page
@@ -1999 +2000 @@
  * @uses get_query_var() To get the user id
  * @uses get_userdata() To get the user data
- * @uses apply_filters() Calls 'bbp_profile_page_wp_raw_title' with the user's
- *                        display name, separator and separator location
+ * @uses apply_filters() Calls 'bbp_raw_title' with the title
  * @uses apply_filters() Calls 'bbp_profile_page_wp_title' with the title,
  *                        separator and separator location
  * @return string The tite
  */
-function bbp_profile_page_title( $title = '', $sep = '»', $seplocation = '' ) {
-        if ( !bbp_is_user_profile_page() && !bbp_is_user_profile_edit() )
-                return;
-
-        $userdata = get_userdata( get_query_var( 'bbp_user_id' ) );
-        $title    = apply_filters( 'bbp_profile_page_wp_raw_title', $userdata->display_name, $sep, $seplocation );
-        $t_sep    = '%WP_TITILE_SEP%'; // Temporary separator, for accurate flipping, if necessary
-
+function bbp_title( $title = '', $sep = '»', $seplocation = '' ) {
+        global $bbp;
+
+        $_title = $title;
+
+        // Profile page
+        if ( bbp_is_user_profile_page() ) {
+
+                if ( bbp_is_user_home() ) {
+                        $title = __( 'Your Profile', 'bbpress' );
+                } else {
+                        $userdata = get_userdata( get_query_var( 'bbp_user_id' ) );
+                        $title    = sprintf( __( '%s\'s Profile', 'bbpress' ), $userdata->display_name );
+                }
+
+        // Profile edit page
+        } elseif ( bbp_is_user_profile_edit() ) {
+
+                if ( bbp_is_user_home() ) {
+                        $title = __( 'Edit Your Profile', 'bbpress' );
+                } else {
+                        $userdata = get_userdata( get_query_var( 'bbp_user_id' ) );
+                        $title    = sprintf( __( 'Edit %s\'s Profile', 'bbpress' ), $userdata->display_name );
+                }
+
+        // Forum page
+        } elseif ( bbp_is_forum() ) {
+
+                $title = sprintf( __( 'Forum: %s', 'bbpress' ), bbp_get_forum_title() );
+
+        // Topic page
+        } elseif ( bbp_is_topic() ) {
+
+                $title = sprintf( __( 'Topic: %s', 'bbpress' ), bbp_get_topic_title() );
+
+        // Replies
+        } elseif ( bbp_is_reply() ) {
+
+                // Normal reply titles already have "Reply To: ", so we shouldn't add our own
+                $title = bbp_get_reply_title();
+
+        } elseif ( is_tax( $bbp->topic_tag_id ) ) {
+
+                $term  = get_queried_object();
+                $title = sprintf( __( 'Topic Tag: %s', 'bbpress' ), $term->name );
+
+        }
+
+        $title  = apply_filters( 'bbp_raw_title', $title, $sep, $seplocation );
+
+        if ( $title == $_title )
+                return $title;
+
+        // Temporary separator, for accurate flipping, if necessary
+        $t_sep  = '%WP_TITILE_SEP%';
         $prefix = '';
+
         if ( !empty( $title ) )
                 $prefix = " $sep ";
@@ -2027 +2075 @@
         }
 
-        $title = apply_filters( 'bbp_profile_page_wp_title', $title, $sep, $seplocation );
+        $title = apply_filters( 'bbp_title', $title, $sep, $seplocation );
 
         return $title;

branches/plugin/bbp-includes/bbp-hooks.php

@@ -73 +73 @@
 
 // Template - Head, foot, errors and notices
-add_action( 'wp_head',              'bbp_head'           );
-add_action( 'wp_footer',            'bbp_footer'         );
-add_action( 'bbp_template_notices', 'bbp_error_messages' );
-add_action( 'bbp_template_notices', 'bbp_topic_notices'  );
+add_action( 'wp_head',              'bbp_head'                 );
+add_filter( 'wp_title',             'bbp_title',         10, 3 );
+add_action( 'wp_footer',            'bbp_footer'               );
+add_action( 'bbp_template_notices', 'bbp_error_messages'       );
+add_action( 'bbp_template_notices', 'bbp_topic_notices'        );
 
 // Caps & Roles
@@ -92 +93 @@
 
 // Profile Page
-add_filter( 'wp_title',          'bbp_profile_page_title',     10, 3 );
-add_action( 'pre_get_posts',     'bbp_pre_get_posts',          1     );
-add_action( 'template_redirect', 'bbp_edit_user_handler',      1     );
+add_action( 'pre_get_posts',     'bbp_pre_get_posts',     1 );
+add_action( 'template_redirect', 'bbp_edit_user_handler', 1 );
 
 // Profile Page Messages

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

@@ -185 +185 @@
  * @param string $filter Optional Sanitation filter. See {@link sanitize_post()}
  * @uses get_post() To get the reply
+ * @uses apply_filters() Calls 'bbp_get_reply' with the reply, output type and
+ *                        sanitation filter
  * @return mixed Null if error or reply (in specified form) if success
  */
@@ -212 +214 @@
         }
 
-        return $reply;
+        return apply_filters( 'bbp_get_reply', $reply, $output, $filter );
 }
 

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

@@ -285 +285 @@
  * @param string $filter Optional Sanitation filter. See {@link sanitize_post()}
  * @uses get_post() To get the topic
+ * @uses apply_filters() Calls 'bbp_get_topic' with the topic, output type and
+ *                        sanitation filter
  * @return mixed Null if error or topic (in specified form) if success
  */
@@ -312 +314 @@
         }
 
-        return $topic;
+        return apply_filters( 'bbp_get_topic', $topic, $output, $filter );
 }