Changeset 7175

Timestamp:

06/06/2013 11:48:53 PM (11 years ago)

Author:

boonebgorges

Message:

When building get_views() links on Groups and Activity admin, build URL base from scratch

Previously, we were taking the current URL and removing query args by name.
Invariably, some query args would be forgotten about, leading to unpredictable
results. By building the base URL from scratch, we avoid any danglers.

Fixes #4901

Location:

trunk

Files:

• bp-activity/bp-activity-admin.php (modified) (1 diff)
• bp-groups/bp-groups-admin.php (modified) (1 diff)

trunk/bp-activity/bp-activity-admin.php

@@ -1128 +1128 @@
      */
     function get_views() {
-        $redirect_to = remove_query_arg( array( 'activity_status', 'aid', 'deleted', 'error', 'spammed', 'unspammed', 'updated', ), $_SERVER['REQUEST_URI'] );
-    ?>
+        $url_base = bp_get_admin_url( 'admin.php?page=bp-activity' ); ?>
+
         <ul class="subsubsub">
-            <li class="all"><a href="<?php echo esc_attr( esc_url( $redirect_to ) ); ?>" class="<?php if ( 'spam' != $this->view ) echo 'current'; ?>"><?php _e( 'All', 'buddypress' ); ?></a> |</li>
-            <li class="spam"><a href="<?php echo esc_attr( esc_url( add_query_arg( 'activity_status', 'spam', $redirect_to ) ) ); ?>" class="<?php if ( 'spam' == $this->view ) echo 'current'; ?>"><?php printf( __( 'Spam <span class="count">(%s)</span>', 'buddypress' ), number_format_i18n( $this->spam_count ) ); ?></a></li>
-
-            <?php do_action( 'bp_activity_list_table_get_views', $redirect_to, $this->view ); ?>
+            <li class="all"><a href="<?php echo esc_attr( esc_url( $url_base ) ); ?>" class="<?php if ( 'spam' != $this->view ) echo 'current'; ?>"><?php _e( 'All', 'buddypress' ); ?></a> |</li>
+            <li class="spam"><a href="<?php echo esc_attr( esc_url( add_query_arg( 'activity_status', 'spam', $url_base ) ) ); ?>" class="<?php if ( 'spam' == $this->view ) echo 'current'; ?>"><?php printf( __( 'Spam <span class="count">(%s)</span>', 'buddypress' ), number_format_i18n( $this->spam_count ) ); ?></a></li>
+
+            <?php do_action( 'bp_activity_list_table_get_views', $url_base, $this->view ); ?>
         </ul>
     <?php

trunk/bp-groups/bp-groups-admin.php

@@ -1214 +1214 @@
      */
     function get_views() {
-        $url_base = remove_query_arg( array( 'orderby', 'order', 'group_status' ), $_SERVER['REQUEST_URI'] ); ?>
+        $url_base = bp_get_admin_url( 'admin.php?page=bp-groups' ); ?>
+
         <ul class="subsubsub">
             <li class="all"><a href="<?php echo esc_attr( esc_url( $url_base ) ); ?>" class="<?php if ( 'all' == $this->view ) echo 'current'; ?>"><?php _e( 'All', 'buddypress' ); ?></a> |</li>