Ticket #6107: 6107.02.patch

src/bp-core/bp-core-filters.php

@@ -509 +509 @@
  * @param string $seplocation Direction to display title.
  * @return string New page title.
  */
-function bp_modify_page_title( $title, $sep = '', $seplocation = '' ) {
+function bp_modify_page_title() {
+        $args = func_get_args();
+        $return_array = false;
+
+        /**
+         * wp_title_parts was introduced in WordPress 4.0
+         *
+         * We first try to use it, if it fails, we still can count on the wp_title filter. We're
+         * using this new way of filtering the title since the introduction of the 'title-tag'
+         * feature (WordPress 4.1) in order to let WordPress build the title with our data.
+         */
+        if ( 'wp_title_parts' == current_filter() ) {
+                $return_array = true;
+
+                // Remove the wp_title filter as we don't need it in this case
+                remove_filter( 'wp_title', 'bp_modify_page_title', 10, 3 );
+        }
 
         // If this is not a BP page, just return the title produced by WP
         if ( bp_is_blog_page() ) {
-                return $title;
+                return $args[0];
         }
 
         // If this is a 404, let WordPress handle it
         if ( is_404() ) {
-                return $title;
+                return $args[0];
         }
 
         // If this is the front page of the site, return WP's title
         if ( is_front_page() || is_home() ) {
-                return $title;
+                return $args[0];
         }
 
-        $bp    = buddypress();
-        $title = '';
+        $bp       = buddypress();
+        $bp_title = array();
 
         // Displayed user
         if ( bp_get_displayed_user_fullname() && ! is_404() ) {
@@ -566 +582 @@
 
                 // If on the user profile's landing page, just use the fullname
                 if ( bp_is_current_component( $bp->default_component ) && bp_get_requested_url() === bp_displayed_user_domain() ) {
-                        $title = bp_get_displayed_user_fullname();
+                        $bp_title[] = bp_get_displayed_user_fullname();
 
                 // Use component name on member pages
                 } else {
+                        $bp_title = array_merge( $bp_title, array_map( 'strip_tags', array(
+                                bp_get_displayed_user_fullname(),
+                                $component_name,
+                        ) ) );
+
                         // If we have a subnav name, add it separately for localization
                         if ( ! empty( $component_subnav_name ) ) {
-                                // translators: construct the page title. 1 = user name, 2 = component name, 3 = separator, 4 = component subnav name
-                                $title = strip_tags( sprintf( __( '%1$s %3$s %2$s %3$s %4$s', 'buddypress' ), bp_get_displayed_user_fullname(), $component_name, $sep, $component_subnav_name ) );
-
-                        } else {
-                                // translators: construct the page title. 1 = user name, 2 = component name, 3 = separator
-                                $title = strip_tags( sprintf( __( '%1$s %3$s %2$s', 'buddypress' ), bp_get_displayed_user_fullname(), $component_name, $sep ) );
+                                $bp_title[] = strip_tags( $component_subnav_name );
                         }
                 }
 
         // A single group
         } elseif ( bp_is_active( 'groups' ) && ! empty( $bp->groups->current_group ) && ! empty( $bp->bp_options_nav[ $bp->groups->current_group->slug ] ) ) {
                 $subnav = isset( $bp->bp_options_nav[ $bp->groups->current_group->slug ][ bp_current_action() ]['name'] ) ? $bp->bp_options_nav[ $bp->groups->current_group->slug ][ bp_current_action() ]['name'] : '';
-                // translators: 1 = group name, 2 = group nav section name, 3 = separator
-                $title = sprintf( __( '%1$s %3$s %2$s', 'buddypress' ), $bp->bp_options_title, $subnav, $sep );
+                $bp_title = array( $bp->bp_options_title, $subnav );
 
         // A single item from a component other than groups
         } elseif ( bp_is_single_item() ) {
-                // translators: 1 = component item name, 2 = component nav section name, 3 = separator
-                $title = sprintf( __( '%1$s %3$s %2$s', 'buddypress' ), $bp->bp_options_title, $bp->bp_options_nav[ bp_current_item() ][ bp_current_action() ]['name'], $sep );
+                $bp_title = array( $bp->bp_options_title, $bp->bp_options_nav[ bp_current_item() ][ bp_current_action() ]['name'] );
 
         // An index or directory
         } elseif ( bp_is_directory() ) {
                 $current_component = bp_current_component();
 
                 // No current component (when does this happen?)
-                if ( empty( $current_component ) ) {
-                        $title = _x( 'Directory', 'component directory title', 'buddypress' );
-                } else {
-                        $title = bp_get_directory_title( $current_component );
+                $bp_title = array( _x( 'Directory', 'component directory title', 'buddypress' ) );
+
+                if ( ! empty( $current_component ) ) {
+                        $bp_title = array( bp_get_directory_title( $current_component ) );
                 }
 
         // Sign up page
         } elseif ( bp_is_register_page() ) {
-                $title = __( 'Create an Account', 'buddypress' );
+                $bp_title = array( __( 'Create an Account', 'buddypress' ) );
 
         // Activation page
         } elseif ( bp_is_activation_page() ) {
-                $title = __( 'Activate your Account', 'buddypress' );
+                $bp_title = array( __( 'Activate your Account', 'buddypress' ) );
 
         // Group creation page
         } elseif ( bp_is_group_create() ) {
-                $title = __( 'Create a Group', 'buddypress' );
+                $bp_title = array( __( 'Create a Group', 'buddypress' ) );
 
         // Blog creation page
         } elseif ( bp_is_create_blog() ) {
-                $title = __( 'Create a Site', 'buddypress' );
+                $bp_title = array( __( 'Create a Site', 'buddypress' ) );
         }
 
         // Some BP nav items contain item counts. Remove them
-        $title = preg_replace( '|<span>[0-9]+</span>|', '', $title );
+        $bp_title = array_map( function( $t ) {
+            return preg_replace( '|<span>[0-9]+</span>|' , '', $t );
+        }, $bp_title);
+
+        if ( ! empty( $return_array ) ) {
+                $title = array_reverse( $bp_title );
+
+                if ( ! bp_is_directory() && ! bp_is_register_page() && ! bp_is_activation_page() ) {
+                        $title = array_merge( array( '' ), $title );
+                }
+
+                /**
+                 * The filters wptexturize, convert_chars and esc_html
+                 * will be applied by WordPress later in wp_title() just
+                 * before returning the title.
+                 *
+                 * @param  array $title list of BuddyPress page title parts
+                 */
+                return apply_filters( 'bp_modify_page_title_parts', $title );
+
+        // Build the title it used to be done before 'title-tag' feature
+        } else {
+
+                // Default separator is &raquo; in WordPress
+                $sep = '&raquo;';
+                if ( ! empty( $args[1] ) ) {
+                        $sep = $args[1];
+                }
 
-        return apply_filters( 'bp_modify_page_title', $title . ' ' . $sep . ' ', $title, $sep, $seplocation );
+                // Arbitrary default seplocation if not set
+                $seplocation = 'right';
+                if ( ! empty( $args[2] ) ) {
+                        $seplocation = $args[2];
+                }
+
+                $title = join( ' ' . $sep . ' ', $bp_title ) . ' ' . $sep . ' ';
+
+                /**
+                 * @param  string $title the BuddyPress page title
+                 * @param  string $args[0] the original WordPress page title
+                 * @param  string $sep the title parts separator
+                 * @param  string $seplocation Location of the separator (left or right).
+                 */
+                return apply_filters( 'bp_modify_page_title', $title, $args[0], $sep, $seplocation );
+        }
 }
-add_filter( 'wp_title', 'bp_modify_page_title', 10, 3 );
+add_filter( 'wp_title_parts', 'bp_modify_page_title', 10, 1 );
+add_filter( 'wp_title',       'bp_modify_page_title', 10, 3 );
 add_filter( 'bp_modify_page_title', 'wptexturize'     );
 add_filter( 'bp_modify_page_title', 'convert_chars'   );
 add_filter( 'bp_modify_page_title', 'esc_html'        );