Ticket #3148: 3148-3.diff

bp-groups/bp-groups-template.php

@@ -71 +71 @@
         var $order;
 
         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;
 
                 $this->pag_page = isset( $_REQUEST['grpage'] ) ? intval( $_REQUEST['grpage'] ) : $page;
@@ -1447 +1452 @@
         var $total_group_count;
 
         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;
 
                 $this->pag_page = isset( $_REQUEST['mlpage'] ) ? intval( $_REQUEST['mlpage'] ) : 1;
@@ -2133 +2142 @@
         var $total_request_count;
 
         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;
 
                 $this->pag_page = isset( $_REQUEST['mrpage'] ) ? intval( $_REQUEST['mrpage'] ) : 1;
@@ -2303 +2318 @@
         var $total_invite_count;
 
         function bp_groups_invite_template( $user_id, $group_id ) {
-                global $bp;
+                $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 );
+
         }
 
         function has_invites() {

bp-activity/bp-activity-template.php

@@ -80 +80 @@
         var $full_name;
 
         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;
 
                 $this->pag_page = isset( $_REQUEST['acpage'] ) ? intval( $_REQUEST['acpage'] ) : $page;

bp-xprofile/bp-xprofile-classes.php

@@ -7 +7 @@
         var $can_delete;
         var $group_order;
         var $fields;
-
+        
         function bp_xprofile_group( $id = null ) {
+                $this->__construct($id);
+        }
+        
+        function __construct( $id = null ) {
                 global $bp, $wpdb;
 
                 if ( $id )
@@ -280 +284 @@
         var $data;
         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 );
         }
@@ -742 +750 @@
         var $field_id;
         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 );
         }