Changeset 6309

Timestamp:

09/06/2012 03:48:42 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Group Admin:

• Only include group admin UI if in wp-admin.

Location:

trunk

Files:

• bp-activity/bp-activity-admin.php (modified) (4 diffs)
• bp-groups/bp-groups-admin.php (modified) (4 diffs)

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

@@ -612 +612 @@
 
         <?php else : ?>
-            <p><?php printf( __( 'No activity found with this ID. <a href="%s">Go back and try again</a>.', 'buddypress' ), network_admin_url( 'admin.php?page=bp-activity' ) ); ?></p>
+            <p><?php printf( __( 'No activity found with this ID. <a href="%s">Go back and try again</a>.', 'buddypress' ), esc_url( bp_get_admin_url( 'admin.php?page=bp-activity' ) ) ); ?></p>
         <?php endif; ?>
 
@@ -875 +875 @@
                             <a href="#" class="save button-primary alignright"><?php _e( 'Reply', 'buddypress' ); ?></a>
 
-                            <img class="waiting" style="display:none;" src="<?php echo esc_url( network_admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
+                            <img class="waiting" style="display:none;" src="<?php echo esc_url( bp_get_admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
                             <span class="error" style="display:none;"></span>
                             <br class="clear" />
@@ -1266 +1266 @@
 
         // Build actions URLs
-        $base_url   = network_admin_url( 'admin.php?page=bp-activity&amp;aid=' . $item['id'] );
+        $base_url   = bp_get_admin_url( 'admin.php?page=bp-activity&amp;aid=' . $item['id'] );
         $spam_nonce = esc_html( '_wpnonce=' . wp_create_nonce( 'spam-activity_' . $item['id'] ) );
 
@@ -1325 +1325 @@
         if ( empty( $item['item_id'] ) || ! in_array( $item['type'], apply_filters( 'bp_activity_admin_root_activity_types', array( 'activity_comment' ), $item ) ) ) {
             $comment_count     = !empty( $item['children'] ) ? bp_activity_recurse_comment_count( (object) $item ) : 0;
-            $root_activity_url = network_admin_url( 'admin.php?page=bp-activity&amp;aid=' . $item['id'] );
+            $root_activity_url = bp_get_admin_url( 'admin.php?page=bp-activity&amp;aid=' . $item['id'] );
 
             // If the activity has comments, display a link to the activity's permalink, with its comment count in a speech bubble
             if ( $comment_count ) {
                 $title_attr = sprintf( _n( '%s related activity', '%s related activities', $comment_count, 'buddypress' ), number_format_i18n( $comment_count ) );
-                printf( '<a href="%1$s" title="%2$s" class="post-com-count"><span class="comment-count">%3$s</span></a>', esc_attr( $root_activity_url ), esc_attr( $title_attr ), number_format_i18n( $comment_count ) );
+                printf( '<a href="%1$s" title="%2$s" class="post-com-count"><span class="comment-count">%3$s</span></a>', esc_url( $root_activity_url ), esc_attr( $title_attr ), number_format_i18n( $comment_count ) );
             }
 

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

@@ -507 +507 @@
 
         <?php else : ?>
-            <p><?php printf( __( 'No group found with this ID. <a href="%s">Go back and try again</a>.', 'buddypress' ), network_admin_url( 'admin.php?page=bp-groups' ) ); ?></p>
+            <p><?php printf( __( 'No group found with this ID. <a href="%s">Go back and try again</a>.', 'buddypress' ), esc_url( bp_get_admin_url( 'admin.php?page=bp-groups' ) ) ); ?></p>
         <?php endif; ?>
 
@@ -810 +810 @@
         'page' => 'bp-groups',
         'gid'  => $item->id
-    ), is_network_admin() ? network_admin_url( 'admin.php' ) : admin_url( 'admin.php' ) );
-?>
+    ), bp_get_admin_url( 'admin.php' ) ); ?>
+
     <div id="submitcomment" class="submitbox">
         <div id="major-publishing-actions">
@@ -1201 +1201 @@
 
         // Build actions URLs
-        $base_url   = network_admin_url( 'admin.php?page=bp-groups&amp;gid=' . $item['id'] );
+        $base_url   = bp_get_admin_url( 'admin.php?page=bp-groups&amp;gid=' . $item['id'] );
 
         $delete_url = wp_nonce_url( $base_url . "&amp;action=delete", 'bp-groups-delete' );
@@ -1210 +1210 @@
 
         // Visit
-        $actions['visit'] = sprintf( '<a href="%s">%s</a>', $visit_url, __( 'Visit', 'buddypress' ) );
+        $actions['visit'] = sprintf( '<a href="%s">%s</a>', esc_url( $visit_url ), __( 'Visit', 'buddypress' ) );
 
         // Edit
-        $actions['edit'] = sprintf( '<a href="%s">%s</a>', $edit_url, __( 'Edit', 'buddypress' ) );
+        $actions['edit'] = sprintf( '<a href="%s">%s</a>', esc_url( $edit_url ), __( 'Edit', 'buddypress' ) );
 
         // Delete
-        $actions['delete'] = sprintf( '<a href="%s">%s</a>', $delete_url, __( 'Delete', 'buddypress' ) );
+        $actions['delete'] = sprintf( '<a href="%s">%s</a>', esc_url( $delete_url ), __( 'Delete', 'buddypress' ) );
 
         // Other plugins can filter which actions are shown