Changeset 4216

Timestamp:

04/19/2011 07:28:07 PM (14 years ago)

Author:

djpaul

Message:

Add PHP5-style constructors to more classes. Fixes #3148 again, props Backie

Location:

trunk

Files:

• bp-activity/bp-activity-template.php (modified) (1 diff)
• bp-groups/bp-groups-template.php (modified) (4 diffs)
• bp-xprofile/bp-xprofile-classes.php (modified) (3 diffs)

trunk/bp-activity/bp-activity-template.php

@@ -81 +81 @@
 
     function bp_activity_template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude, $in ) {
+        $this->__construct( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude, $in );
+    }
+
+    function __construct( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude, $in ) {
         global $bp;
 

trunk/bp-groups/bp-groups-template.php

@@ -72 +72 @@
 
     function bp_groups_template( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $include, $populate_extras, $exclude, $show_hidden ) {
+        $this->__construct( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $include, $populate_extras, $exclude, $show_hidden );
+    }
+
+    function __construct( $user_id, $type, $page, $per_page, $max, $slug, $search_terms, $include, $populate_extras, $exclude, $show_hidden ){
+
         global $bp;
 
@@ -1448 +1453 @@
 
     function bp_groups_group_members_template( $group_id, $per_page, $max, $exclude_admins_mods, $exclude_banned, $exclude ) {
+        $this->__construct( $group_id, $per_page, $max, $exclude_admins_mods, $exclude_banned, $exclude );  
+    }
+    
+    function __construct( $group_id, $per_page, $max, $exclude_admins_mods, $exclude_banned, $exclude ) {
         global $bp;
 
@@ -2134 +2143 @@
 
     function bp_groups_membership_requests_template( $group_id, $per_page, $max ) {
+        $this->__construct( $group_id, $per_page, $max );
+    }
+    
+    
+    function __construct( $group_id, $per_page, $max ) {
+        
         global $bp;
 
@@ -2304 +2319 @@
 
     function bp_groups_invite_template( $user_id, $group_id ) {
+        $this->__construct( $user_id, $group_id ); 
+    }
+        
+    function __construct( $user_id, $group_id ) {
+
         global $bp;
-
+        
         $this->invites = groups_get_invites_for_group( $user_id, $group_id );
         $this->invite_count = count( $this->invites );
+
     }
 

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -10 +10 @@
 
     function bp_xprofile_group( $id = null ) {
+        $this->__construct( $id );
+    }
+
+    function __construct( $id = null ) {
         global $bp, $wpdb;
 
@@ -281 +285 @@
     var $message = null;
     var $message_type = 'err';
-
+    
     function bp_xprofile_field( $id = null, $user_id = null, $get_data = true ) {
+        $this->__construct( $id, $user_id, $get_data );
+    }
+    
+    function __construct( $id = null, $user_id = null, $get_data = true ) {
         if ( $id )
             $this->populate( $id, $user_id, $get_data );
@@ -743 +751 @@
     var $value;
     var $last_updated;
-
+    
     function bp_xprofile_profiledata( $field_id = null, $user_id = null ) {
+        $this->__construct( $field_id, $user_id );      
+    }
+    
+    function __construct( $field_id = null, $user_id = null ) {
         if ( $field_id )
             $this->populate( $field_id, $user_id );