Index: bp-settings/bp-settings-loader.php =================================================================== --- bp-settings/bp-settings-loader.php (revision 4200) +++ bp-settings/bp-settings-loader.php (working copy) @@ -8,6 +8,10 @@ * @since BuddyPress {unknown} */ function BP_Settings_Component() { + $this->__construct(); + } + + function __construct(){ parent::start( 'settings', __( 'Settings', 'buddypress' ), Index: bp-friends/bp-friends-loader.php =================================================================== --- bp-friends/bp-friends-loader.php (revision 4200) +++ bp-friends/bp-friends-loader.php (working copy) @@ -17,6 +17,10 @@ * @since BuddyPress {unknown} */ function BP_Friends_Component() { + $this->__construct(); + } + + function __construct(){ parent::start( 'friends', __( 'Friend Connections', 'buddypress' ), Index: bp-friends/bp-friends-classes.php =================================================================== --- bp-friends/bp-friends-classes.php (revision 4200) +++ bp-friends/bp-friends-classes.php (working copy) @@ -14,6 +14,10 @@ var $friend; function bp_friends_friendship( $id = null, $is_request = false, $populate_friend_details = true ) { + $this->__construct($id,$is_request,$populate_friend_details); + } + + function __construct( $id = null, $is_request = false, $populate_friend_details = true ){ $this->is_request = $is_request; if ( $id ) { Index: bp-groups/bp-groups-classes.php =================================================================== --- bp-groups/bp-groups-classes.php (revision 4200) +++ bp-groups/bp-groups-classes.php (working copy) @@ -15,6 +15,10 @@ var $total_member_count; function bp_groups_group( $id = null ) { + $this->__construct($id); + } + + function __construct( $id = null ){ if ( $id ) { $this->id = $id; $this->populate(); @@ -604,6 +608,10 @@ var $user; function bp_groups_member( $user_id = 0, $group_id = 0, $id = false, $populate = true ) { + $this->__construct($user_id,$group_id,$id,$populate); + } + + function __construct( $user_id = 0, $group_id = 0, $id = false, $populate = true ){ if ( $user_id && $group_id && !$id ) { $this->user_id = $user_id; $this->group_id = $group_id; Index: bp-groups/bp-groups-widgets.php =================================================================== --- bp-groups/bp-groups-widgets.php (revision 4200) +++ bp-groups/bp-groups-widgets.php (working copy) @@ -10,8 +10,12 @@ class BP_Groups_Widget extends WP_Widget { function bp_groups_widget() { + $this->_construct(); + } + + function __construct(){ $widget_ops = array( 'description' => __( 'A dynamic list of recently active, popular, and newest groups', 'buddypress' ) ); - parent::WP_Widget( false, __( 'Groups', 'buddypress' ), $widget_ops ); + parent::__construct( false, __( 'Groups', 'buddypress' ), $widget_ops ); if ( is_active_widget( false, false, $this->id_base ) ) { if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) Index: bp-groups/bp-groups-loader.php =================================================================== --- bp-groups/bp-groups-loader.php (revision 4200) +++ bp-groups/bp-groups-loader.php (working copy) @@ -20,6 +20,10 @@ * @since BuddyPress {unknown} */ function BP_Groups_Component() { + $this->__construct(); + } + + function __construct(){ parent::start( 'groups', __( 'User Groups', 'buddypress' ), Index: bp-members/bp-members-template.php =================================================================== --- bp-members/bp-members-template.php (revision 4200) +++ bp-members/bp-members-template.php (working copy) @@ -140,6 +140,10 @@ var $total_member_count; function bp_core_members_template( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude ) { + $this->__construct( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude ); + } + + function __construct( $type, $page_number, $per_page, $max, $user_id, $search_terms, $include, $populate_extras, $exclude ){ global $bp; $this->pag_page = !empty( $_REQUEST['upage'] ) ? intval( $_REQUEST['upage'] ) : (int)$page_number; Index: bp-members/bp-members-loader.php =================================================================== --- bp-members/bp-members-loader.php (revision 4200) +++ bp-members/bp-members-loader.php (working copy) @@ -17,6 +17,10 @@ * @since BuddyPress {unknown} */ function BP_Members_Component() { + $this->__construct(); + } + + function __construct(){ parent::start( 'members', __( 'Members', 'buddypress' ), Index: bp-activity/bp-activity-classes.php =================================================================== --- bp-activity/bp-activity-classes.php (revision 4200) +++ bp-activity/bp-activity-classes.php (working copy) @@ -16,6 +16,10 @@ var $mptt_right; function bp_activity_activity( $id = false ) { + $this->__construct($id); + } + + function __construct( $id = false ){ global $bp; if ( !empty( $id ) ) { Index: bp-activity/bp-activity-loader.php =================================================================== --- bp-activity/bp-activity-loader.php (revision 4200) +++ bp-activity/bp-activity-loader.php (working copy) @@ -17,6 +17,10 @@ * @since BuddyPress {unknown} */ function BP_Activity_Component() { + $this->__construct(); + } + + function __construct(){ parent::start( 'activity', __( 'Activity Streams', 'buddypress' ), Index: bp-core/bp-core-widgets.php =================================================================== --- bp-core/bp-core-widgets.php (revision 4200) +++ bp-core/bp-core-widgets.php (working copy) @@ -11,9 +11,14 @@ /*** MEMBERS WIDGET *****************/ class BP_Core_Members_Widget extends WP_Widget { + function bp_core_members_widget() { + $this->__construct(); + } + + function __construct(){ $widget_ops = array( 'description' => __( 'A dynamic list of recently active, popular, and newest members', 'buddypress' ) ); - parent::WP_Widget( false, $name = __( 'Members', 'buddypress' ), $widget_ops ); + parent::__construct( false, $name = __( 'Members', 'buddypress' ), $widget_ops ); if ( is_active_widget( false, false, $this->id_base ) ) { if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) @@ -134,9 +139,14 @@ /*** WHO'S ONLINE WIDGET *****************/ class BP_Core_Whos_Online_Widget extends WP_Widget { + function bp_core_whos_online_widget() { + $this->__construct(); + } + + function __construct(){ $widget_ops = array( 'description' => __( 'Avatars of users who are currently online', 'buddypress' ) ); - parent::WP_Widget( false, $name = __( "Who's Online Avatars", 'buddypress' ), $widget_ops ); + parent::__construct( false, $name = __( "Who's Online Avatars", 'buddypress' ), $widget_ops ); } function widget($args, $instance) { @@ -198,9 +208,14 @@ /*** RECENTLY ACTIVE WIDGET *****************/ class BP_Core_Recently_Active_Widget extends WP_Widget { + function bp_core_recently_active_widget() { + $this->__construct(); + } + + function __construct(){ $widget_ops = array( 'description' => __( 'Avatars of recently active members', 'buddypress' ) ); - parent::WP_Widget( false, $name = __( 'Recently Active Member Avatars', 'buddypress' ), $widget_ops ); + parent::__construct( false, $name = __( 'Recently Active Member Avatars', 'buddypress' ), $widget_ops ); } function widget($args, $instance) { Index: bp-core/bp-core-classes.php =================================================================== --- bp-core/bp-core-classes.php (revision 4200) +++ bp-core/bp-core-classes.php (working copy) @@ -31,6 +31,10 @@ var $total_groups; function bp_core_user( $user_id, $populate_extras = false ) { + $this->__construct($user_id,$populate_extras); + } + + function __construct( $user_id, $populate_extras = false ){ if ( $user_id ) { $this->id = $user_id; $this->populate(); @@ -446,6 +450,10 @@ var $is_new; function bp_core_notification( $id = false ) { + $this->__construct($id); + } + + function __construct( $id = false ){ if ( $id ) { $this->id = $id; $this->populate(); @@ -589,6 +597,10 @@ * @return bool False if not allowed */ function bp_button( $args = '' ) { + $this->__construct($args); + } + + function __construct( $args = '' ){ // Default arguments $defaults = array( Index: bp-core/admin/bp-core-update.php =================================================================== --- bp-core/admin/bp-core-update.php (revision 4200) +++ bp-core/admin/bp-core-update.php (working copy) @@ -10,6 +10,10 @@ var $setup_type; function bp_core_setup_wizard() { + $this->__construct(); + } + + function __construct(){ // Look for current DB version if ( !$this->database_version = get_site_option( 'bp-db-version' ) ) { if ( $this->database_version = get_option( 'bp-db-version' ) ) { Index: bp-core/bp-core-loader.php =================================================================== --- bp-core/bp-core-loader.php (revision 4200) +++ bp-core/bp-core-loader.php (working copy) @@ -26,6 +26,10 @@ class BP_Core extends BP_Component { function BP_Core() { + $this->__construct(); + } + + function __construct(){ parent::start( '_core', __( 'BuddyPress Core', 'buddypress' ) Index: bp-messages/bp-messages-template.php =================================================================== --- bp-messages/bp-messages-template.php (revision 4200) +++ bp-messages/bp-messages-template.php (working copy) @@ -20,6 +20,10 @@ var $pag_links; function bp_messages_box_template( $user_id, $box, $per_page, $max, $type ) { + $this->__construct( $user_id, $box, $per_page, $max, $type ); + } + + function __construct( $user_id, $box, $per_page, $max, $type ){ $this->pag_page = isset( $_GET['mpage'] ) ? intval( $_GET['mpage'] ) : 1; $this->pag_num = isset( $_GET['num'] ) ? intval( $_GET['num'] ) : $per_page; @@ -611,6 +615,9 @@ var $total_message_count; function bp_messages_thread_template( $thread_id, $order ) { + $this->__construct( $thread_id, $order ); + } + function __construct( $thread_id, $order ){ global $bp; $this->thread = new BP_Messages_Thread( $thread_id, $order ); Index: bp-messages/bp-messages-loader.php =================================================================== --- bp-messages/bp-messages-loader.php (revision 4200) +++ bp-messages/bp-messages-loader.php (working copy) @@ -17,6 +17,10 @@ * @since BuddyPress {unknown} */ function BP_Messages_Component() { + $this->__construct(); + } + + function __construct(){ parent::start( 'messages', __( 'Private Messages', 'buddypress' ), Index: bp-messages/bp-messages-classes.php =================================================================== --- bp-messages/bp-messages-classes.php (revision 4200) +++ bp-messages/bp-messages-classes.php (working copy) @@ -9,6 +9,10 @@ var $unread_count; function bp_messages_thread ( $thread_id = false, $order = 'ASC' ) { + $this->__construct( $thread_id, $order); + } + + function __construct( $thread_id = false, $order = 'ASC' ){ if ( $thread_id ) $this->populate( $thread_id, $order ); } @@ -245,6 +249,10 @@ var $recipients = false; function bp_messages_message( $id = null ) { + $this->__construct( $id ); + } + + function __construct( $id = null ){ global $bp; $this->date_sent = bp_core_current_time(); @@ -362,6 +370,10 @@ var $is_active; function bp_messages_notice( $id = null ) { + $this->__construct($id); + } + + function __construct( $id = null ){ if ( $id ) { $this->id = $id; $this->populate($id); Index: bp-xprofile/bp-xprofile-template.php =================================================================== --- bp-xprofile/bp-xprofile-template.php (revision 4200) +++ bp-xprofile/bp-xprofile-template.php (working copy) @@ -18,6 +18,10 @@ var $user_id; function bp_xprofile_data_template( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false ) { + $this->__construct( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields ); + } + + function __construct( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false ){ $this->groups = BP_XProfile_Group::get( array( 'profile_group_id' => $profile_group_id, 'user_id' => $user_id, Index: bp-xprofile/bp-xprofile-loader.php =================================================================== --- bp-xprofile/bp-xprofile-loader.php (revision 4200) +++ bp-xprofile/bp-xprofile-loader.php (working copy) @@ -18,6 +18,10 @@ * @since BuddyPress {unknown} */ function BP_XProfile_Component() { + $this->__construct(); + } + + function __construct(){ parent::start( 'xprofile', __( 'Extended Profiles', 'buddypress' ), Index: bp-forums/bp-forums-bbpress-sa.php =================================================================== --- bp-forums/bp-forums-bbpress-sa.php (revision 4200) +++ bp-forums/bp-forums-bbpress-sa.php (working copy) @@ -137,7 +137,12 @@ var $db_servers = array(); function BPDB( $dbuser, $dbpassword, $dbname, $dbhost ) { - parent::WPDB( $dbuser, $dbpassword, $dbname, $dbhost ); + $this->__construct( $dbuser, $dbpassword, $dbname, $dbhost ); + } + + function __construct( $dbuser, $dbpassword, $dbname, $dbhost ){ + + parent::__construct( $dbuser, $dbpassword, $dbname, $dbhost ); $args = func_get_args(); $args = call_user_func_array( array( &$this, '_init' ), $args ); Index: bp-forums/bp-forums-loader.php =================================================================== --- bp-forums/bp-forums-loader.php (revision 4200) +++ bp-forums/bp-forums-loader.php (working copy) @@ -17,6 +17,10 @@ * @since BuddyPress {unknown} */ function BP_Forums_Component() { + $this->__construct(); + } + + function __construct(){ parent::start( 'forums', __( 'Discussion Forums', 'buddypress' ), Index: bp-forums/bp-forums-template.php =================================================================== --- bp-forums/bp-forums-template.php (revision 4200) +++ bp-forums/bp-forums-template.php (working copy) @@ -69,6 +69,10 @@ var $order; function BP_Forums_Template_Forum( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms ) { + $this->__construct( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms ); + } + + function __construct( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms ) { global $bp; $this->pag_page = isset( $_REQUEST['p'] ) ? intval( $_REQUEST['p'] ) : $page; @@ -789,6 +793,10 @@ var $order; function BP_Forums_Template_Topic( $topic_id, $per_page, $max, $order ) { + $this->__construct( $topic_id, $per_page, $max, $order ); + } + + function __construct( $topic_id, $per_page, $max, $order ){ global $bp, $current_user, $forum_template; $this->pag_page = isset( $_REQUEST['topic_page'] ) ? intval( $_REQUEST['topic_page'] ) : 1; Index: bp-blogs/bp-blogs-template.php =================================================================== --- bp-blogs/bp-blogs-template.php (revision 4200) +++ bp-blogs/bp-blogs-template.php (working copy) @@ -66,6 +66,10 @@ var $total_blog_count; function bp_blogs_template( $type, $page, $per_page, $max, $user_id, $search_terms ) { + $this->__construct( $type, $page, $per_page, $max, $user_id, $search_terms ); + } + + function __construct( $type, $page, $per_page, $max, $user_id, $search_terms ){ global $bp; $this->pag_page = isset( $_REQUEST['bpage'] ) ? intval( $_REQUEST['bpage'] ) : $page; Index: bp-blogs/bp-blogs-widgets.php =================================================================== --- bp-blogs/bp-blogs-widgets.php (revision 4200) +++ bp-blogs/bp-blogs-widgets.php (working copy) @@ -14,8 +14,13 @@ add_action( 'bp_register_widgets', 'bp_blogs_register_widgets' ); class BP_Blogs_Recent_Posts_Widget extends WP_Widget { + function bp_blogs_recent_posts_widget() { - parent::WP_Widget( false, $name = __( 'Recent Site Wide Posts', 'buddypress' ) ); + $this->__construct(); + } + + function __construct(){ + parent::__construct( false, $name = __( 'Recent Site Wide Posts', 'buddypress' ) ); } function widget($args, $instance) { Index: bp-blogs/bp-blogs-loader.php =================================================================== --- bp-blogs/bp-blogs-loader.php (revision 4200) +++ bp-blogs/bp-blogs-loader.php (working copy) @@ -17,6 +17,10 @@ * @since BuddyPress {unknown} */ function BP_Blogs_Component() { + $this->__construct(); + } + + function __construct(){ parent::start( 'blogs', __( 'Blogs Streams', 'buddypress' ), Index: bp-blogs/bp-blogs-classes.php =================================================================== --- bp-blogs/bp-blogs-classes.php (revision 4200) +++ bp-blogs/bp-blogs-classes.php (working copy) @@ -6,6 +6,10 @@ var $blog_id; function bp_blogs_blog( $id = null ) { + $this->__construct( $id ); + } + + function __construct( $id = null ){ global $bp, $wpdb; $user_id = $bp->displayed_user->id;