Changeset 1809

Timestamp:

09/07/2009 06:46:37 PM (16 years ago)

Author:

apeatling

Message:

Fixes #983

Location:

trunk

Files:

• bp-activity.php (modified) (1 diff)
• bp-blogs.php (modified) (1 diff)
• bp-core.php (modified) (2 diffs)
• bp-groups.php (modified) (3 diffs)
• bp-groups/bp-groups-classes.php (modified) (3 diffs)
• bp-messages.php (modified) (1 diff)
• bp-wire.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-filters.php (modified) (2 diffs)

trunk/bp-activity.php

@@ -104 +104 @@
     do_action( 'bp_activity_setup_nav' );
 }
-add_action( 'wp', 'bp_activity_setup_nav', 2 );
-add_action( 'admin_menu', 'bp_activity_setup_nav', 2 );
+add_action( 'plugins_loaded', 'bp_activity_setup_nav' );
+add_action( 'admin_menu', 'bp_activity_setup_nav' );
 
 

trunk/bp-blogs.php

@@ -168 +168 @@
     do_action( 'bp_blogs_setup_nav' );
 }
-add_action( 'wp', 'bp_blogs_setup_nav', 2 );
-add_action( 'admin_menu', 'bp_blogs_setup_nav', 2 );
+add_action( 'plugins_loaded', 'bp_blogs_setup_nav' );
+add_action( 'admin_menu', 'bp_blogs_setup_nav' );
 
 function bp_blogs_directory_blogs_setup() {

trunk/bp-core.php

@@ -352 +352 @@
     }   
 }
-add_action( 'wp', 'bp_core_setup_nav', 2 );
-add_action( 'admin_menu', 'bp_core_setup_nav', 2 );
+add_action( 'plugins_loaded', 'bp_core_setup_nav' );
+add_action( 'admin_menu', 'bp_core_setup_nav' );
 
 
@@ -1039 +1039 @@
     }
     
-    return apply_filters( 'bp_core_get_user_displayname', stripslashes( wp_filter_kses( trim( $fullname ) ) ) );
-}
+    return apply_filters( 'bp_core_get_user_displayname', $fullname );
+}
+add_filter( 'bp_core_get_user_displayname', 'wp_filter_kses', 1 );
+add_filter( 'bp_core_get_user_displayname', 'force_balance_tags' );
+add_filter( 'bp_core_get_user_displayname', 'trim' );
+add_filter( 'bp_core_get_user_displayname', 'stripslashes' );
+
 
 /**

trunk/bp-groups.php

@@ -293 +293 @@
     do_action( 'groups_setup_nav', $bp->groups->current_group->user_has_access );
 }
-add_action( 'wp', 'groups_setup_nav', 2 );
-add_action( 'admin_menu', 'groups_setup_nav', 2 );
+add_action( 'plugins_loaded', 'groups_setup_nav' );
+add_action( 'admin_menu', 'groups_setup_nav' );
 
 function groups_directory_groups_setup() {
@@ -467 +467 @@
             groups_send_invites( $bp->groups->new_group_id, $bp->loggedin_user->id );
         }
-        
+
         do_action( 'groups_create_group_step_save_' . $bp->groups->current_create_step );
         do_action( 'groups_create_group_step_complete' ); // Mostly for clearing cache on a generic action name
@@ -2530 +2530 @@
     
     $meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
-    $meta_value = (string)$meta_value;
 
     if ( is_string($meta_value) )

trunk/bp-groups/bp-groups-classes.php

@@ -926 +926 @@
     var $nav_item_name = false;
     
+    var $display_hook = 'groups_custom_group_boxes';
     var $template_file = 'plugin-template';
     
@@ -1004 +1005 @@
             /* Hook the group home widget */
             if ( $bp->current_component == $bp->groups->slug && $bp->is_single_item && ( !$bp->current_action || 'home' == $bp->current_action ) )
-                add_action( 'groups_custom_group_boxes', array( &$this, 'widget_display' ) );
+                add_action( $this->display_hook, array( &$this, 'widget_display' ) );
         }
     }
@@ -1020 +1021 @@
         return false;
     
-    $extension = new $group_extension_class;
-    add_action( 'wp', array( &$extension, '_register' ), 2 );
+    /* Register the group extension on the plugins_loaded action so we have access to all plugins */
+    add_action( 'plugins_loaded', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "wp", array( &$extension, "_register" ), 2 );' ) );
 }
 

trunk/bp-messages.php

@@ -137 +137 @@
     do_action( 'messages_setup_nav' );
 }
-add_action( 'wp', 'messages_setup_nav', 2 );
-add_action( 'admin_menu', 'messages_setup_nav', 2 );
+add_action( 'plugins_loaded', 'messages_setup_nav' );
+add_action( 'admin_menu', 'messages_setup_nav' );
 
 

trunk/bp-wire.php

@@ -53 +53 @@
     do_action( 'bp_wire_setup_nav' );
 }
-add_action( 'wp', 'bp_wire_setup_nav', 2 );
-add_action( 'admin_menu', 'bp_wire_setup_nav', 2 );
+add_action( 'plugins_loaded', 'bp_wire_setup_nav' );
+add_action( 'admin_menu', 'bp_wire_setup_nav' );
 
 

trunk/bp-xprofile.php

@@ -222 +222 @@
     do_action( 'xprofile_setup_nav' );
 }
-add_action( 'wp', 'xprofile_setup_nav', 2 );
-add_action( 'admin_menu', 'xprofile_setup_nav', 2 );
+add_action( 'plugins_loaded', 'xprofile_setup_nav' );
+add_action( 'admin_menu', 'xprofile_setup_nav' );
 
 

trunk/bp-xprofile/bp-xprofile-filters.php

@@ -18 +18 @@
 add_filter( 'bp_get_the_profile_field_value', 'wpautop' );
 add_filter( 'bp_get_the_profile_field_value', 'make_clickable' );
+add_filter( 'bp_get_the_profile_field_value', 'force_balance_tags' );
 
 add_filter( 'bp_get_the_profile_field_value', 'xprofile_filter_format_field_value', 1, 2 );
@@ -62 +63 @@
                     $new_values[] = $value;
                 else
-                    $new_values[] = '<a href="' . site_url( BP_MEMBERS_SLUG ) . '/?s=' . $value . '">' . $value . '</a>';
+                    $new_values[] = '<a href="' . site_url( BP_MEMBERS_SLUG ) . '/?s=' . strip_tags( $value ) . '">' . $value . '</a>';
             }
         }