Changeset 5934

Timestamp:

03/16/2012 04:22:12 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Whitelist 'page' action variable to prevent bbPress pagination from unsetting the action in the canonical_stack. Fixes #4084.

File:

• trunk/bp-core/bp-core-buddybar.php (modified) (2 diffs)

trunk/bp-core/bp-core-buddybar.php

@@ -80 +80 @@
         // version will not contain this subnav slug.
         if ( !empty( $default_subnav_slug ) && bp_is_current_action( $default_subnav_slug ) ) {
-            unset( $bp->canonical_stack['action'] );
+            if ( ! bp_is_action_variable( 'page', 0 ) && ! bp_action_variable( 1 ) ) {
+                unset( $bp->canonical_stack['action'] );
+            }
         } else if ( !bp_current_action() ) {
             if ( is_object( $screen_function[0] ) ) {
@@ -100 +102 @@
         // The canonical version will not contain this subnav slug.
         if ( !empty( $default_subnav_slug ) && bp_is_current_action( $default_subnav_slug ) ) {
-            unset( $bp->canonical_stack['action'] );
+            if ( ! bp_is_action_variable( 'page', 0 ) && ! bp_action_variable( 1 ) ) {
+                unset( $bp->canonical_stack['action'] );
+            }
         } else if ( !bp_current_action() ) {
             if ( is_object( $screen_function[0] ) ) {