Ticket #5810: 5810.patch

src/bp-core/bp-core-template.php

@@ -1294 +1294 @@
 }
 
 /**
+ * Is the directory, the parent of the page being viewed.
+ *
+ * @since BuddyPress (2.1.0).
+ * 
+ * @param  integer $object_id the id to check
+ * @return bool True if the directory is the parent of the page, otherwise
+ *         false.
+ */
+function bp_is_directory_current_parent( $object_id = 0 ) {
+        $retval = false;
+
+        if ( ! is_buddypress() || empty( $object_id ) ) {
+                return $retval;
+        }
+
+        foreach ( buddypress()->pages as $page ) {
+                if ( ! empty( $page->key ) && $object_id == $page->id ) {
+                        $retval = true;
+                        break;
+                }
+        }
+
+        return (bool) apply_filters( 'bp_is_directory_current_parent', $retval );
+}
+
+/**
  * Check to see if a component's URL should be in the root, not under a member page.
  *
  * - Yes ('groups' is root)    : http://domain.com/groups/the-group

src/bp-templates/bp-legacy/buddypress-functions.php

@@ -90 +90 @@
                 /** Body no-js Class ********************************************************/
                 add_filter( 'body_class', array( $this, 'add_nojs_body_class' ), 20, 1 );
 
+                /** WP Nav Menu & WP List Pages current parent page parent css fix ************/
+                add_filter( 'nav_menu_css_class', array( $this, 'directory_current_parent_page' ), 10, 2 );
+                add_filter( 'page_css_class',     array( $this, 'directory_current_parent_page' ), 10, 2 );
+
                 /** Buttons ***********************************************************/
 
                 if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
@@ -381 +385 @@
         }
 
         /**
+         * Adds the current_page_parent class to menu item, if needed.
+         * 
+         * When viewing a single member/group, this function make sure a current_page_parent class
+         * is added to the parent directory item/page listed in the WP Nav Menu /WP List Pages 
+         * 
+         * @since  BuddyPress (2.1.0)
+         * @param  array   $classes the list of nav item/page classes
+         * @param  WP_Post $item    the nav item or page object
+         * @return array   $classes
+         */
+        public function directory_current_parent_page( $classes = array(), $item = null ) {
+                // Bail if not displaying a single user or group
+                if ( ! bp_is_user() && ! bp_is_group() ) {
+                        return $classes;
+                }
+
+                // Page and nav menu item are post types
+                if ( ! is_a( $item, 'WP_Post' ) ) {
+                        return $classes;
+                }
+
+                $object_id = 'ID';
+
+                if ( 'page' != $item->post_type ) {
+                        $object_id = 'object_id';
+                }
+
+                // Bail if the object id is not set
+                if ( empty( $item->{$object_id} ) ) {
+                        return $classes;
+                }
+
+                // Set the current page parent class
+                $current_page_parent = array( 'current_page_parent' );
+
+                /**
+                 * If a page is set to list blog posts, it will always be the
+                 * default parent. So we need to remove the current page parent
+                 * class.
+                 */
+                if ( ! bp_is_directory_current_parent( $item->{$object_id} ) ) {
+                        $classes = array_diff( $classes, $current_page_parent );
+
+                // Make sure the parent directory is the current page parent
+                } else {
+                        $classes = array_merge( $classes, $current_page_parent );
+                }
+
+                return $classes;
+        }
+
+        /**
          * Load localizations for topic script
          *
          * These localizations require information that may not be loaded even by init.