Changeset 3479

Timestamp:

11/23/2010 10:59:37 PM (13 years ago)

Author:

djpaul

Message:

Don't pass function arguments by reference, as deprecated in PHP 5.3. Fixes #2759.

Location:

trunk

Files:

• bp-activity/bp-activity-templatetags.php (modified) (2 diffs)
• bp-blogs.php (modified) (2 diffs)
• bp-blogs/bp-blogs-templatetags.php (modified) (1 diff)
• bp-core.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-forums/bp-forums-templatetags.php (modified) (2 diffs)
• bp-friends.php (modified) (2 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (4 diffs)
• bp-messages/bp-messages-templatetags.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (1 diff)

trunk/bp-activity/bp-activity-templatetags.php

@@ -259 +259 @@
     $activities_template = new BP_Activity_Template( $page, $per_page, $max, $include, $sort, $filter, $search_terms, $display_comments, $show_hidden, $exclude );
 
-    return apply_filters( 'bp_has_activities', $activities_template->has_activities(), &$activities_template );
+    return apply_filters( 'bp_has_activities', $activities_template->has_activities(), $activities_template );
 }
 
@@ -589 +589 @@
         /* Add the delete link if the user has permission on this item */
         if ( ( is_user_logged_in() && $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || $bp->loggedin_user->is_super_admin )
-             $content .= apply_filters( 'bp_activity_delete_link', ' · ' . bp_get_activity_delete_link(), &$activities_template->activity );
+             $content .= apply_filters( 'bp_activity_delete_link', ' · ' . bp_get_activity_delete_link(), $activities_template->activity );
 
         return apply_filters( 'bp_insert_activity_meta', $content );

trunk/bp-blogs.php

@@ -235 +235 @@
     extract( $params, EXTR_SKIP );
 
-    return apply_filters( 'bp_blogs_get_blogs', BP_Blogs_Blog::get( $type, $per_page, $page, $user_id, $search_terms ), &$params );
+    return apply_filters( 'bp_blogs_get_blogs', BP_Blogs_Blog::get( $type, $per_page, $page, $user_id, $search_terms ), $params );
 }
 
@@ -299 +299 @@
         bp_blogs_record_activity( array(
             'user_id'      => $recorded_blog->user_id,
-            'action'       => apply_filters( 'bp_blogs_activity_created_blog_action', sprintf( __( '%s created the blog %s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_site_url( $recorded_blog->blog_id ) . '">' . esc_attr( $name ) . '</a>' ), &$recorded_blog, $name, $description ),
+            'action'       => apply_filters( 'bp_blogs_activity_created_blog_action', sprintf( __( '%s created the blog %s', 'buddypress'), bp_core_get_userlink( $recorded_blog->user_id ), '<a href="' . get_site_url( $recorded_blog->blog_id ) . '">' . esc_attr( $name ) . '</a>' ), $recorded_blog, $name, $description ),
             'primary_link' => apply_filters( 'bp_blogs_activity_created_blog_primary_link', get_site_url( $recorded_blog->blog_id ), $recorded_blog->blog_id ),
             'type'         => 'new_blog',

trunk/bp-blogs/bp-blogs-templatetags.php

@@ -152 +152 @@
 
     $blogs_template = new BP_Blogs_Template( $type, $page, $per_page, $max, $user_id, $search_terms );
-    return apply_filters( 'bp_has_blogs', $blogs_template->has_blogs(), &$blogs_template );
+    return apply_filters( 'bp_has_blogs', $blogs_template->has_blogs(), $blogs_template );
 }
 

trunk/bp-core.php

@@ -575 +575 @@
     extract( $params, EXTR_SKIP );
 
-    return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $include, $search_terms, $populate_extras, $exclude ), &$params );
+    return apply_filters( 'bp_core_get_users', BP_Core_User::get_users( $type, $per_page, $page, $user_id, $include, $search_terms, $populate_extras, $exclude ), $params );
 }
 

trunk/bp-core/bp-core-templatetags.php

@@ -167 +167 @@
 
     $members_template = new BP_Core_Members_Template( $type, $page, $per_page, $max, $user_id, $search_terms, $include, (bool)$populate_extras, $exclude );
-    return apply_filters( 'bp_has_members', $members_template->has_members(), &$members_template );
+    return apply_filters( 'bp_has_members', $members_template->has_members(), $members_template );
 }
 

trunk/bp-forums/bp-forums-templatetags.php

@@ -219 +219 @@
 
     $forum_template = new BP_Forums_Template_Forum( $type, $forum_id, $user_id, $page, $per_page, $max, $no_stickies, $search_terms );
-    return apply_filters( 'bp_has_topics', $forum_template->has_topics(), &$forum_template );
+    return apply_filters( 'bp_has_topics', $forum_template->has_topics(), $forum_template );
 }
 
@@ -847 +847 @@
     }
 
-    return apply_filters( 'bp_has_topic_posts', $topic_template->has_posts(), &$topic_template );
+    return apply_filters( 'bp_has_topic_posts', $topic_template->has_posts(), $topic_template );
 }
 

trunk/bp-friends.php

@@ -396 +396 @@
             'user_id'           => $friendship->initiator_user_id,
             'type'              => 'friendship_created',
-            'action'            => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $initiator_link, $friend_link ), &$friendship ),
+            'action'            => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $initiator_link, $friend_link ), $friendship ),
             'item_id'           => $friendship_id,
             'secondary_item_id' => $friendship->friend_user_id
@@ -405 +405 @@
             'user_id'           => $friendship->friend_user_id,
             'type'              => 'friendship_created',
-            'action'            => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $friend_link, $initiator_link ), &$friendship ),
+            'action'            => apply_filters( 'friends_activity_friendship_accepted_action', sprintf( __( '%1$s and %2$s are now friends', 'buddypress' ), $friend_link, $initiator_link ), $friendship ),
             'item_id'           => $friendship_id,
             'secondary_item_id' => $friendship->initiator_user_id,

trunk/bp-groups/bp-groups-templatetags.php

@@ -188 +188 @@
 
     $groups_template = new BP_Groups_Template( (int)$user_id, $type, (int)$page, (int)$per_page, (int)$max, $slug, $search_terms, $include, (bool)$populate_extras, $exclude );
-    return apply_filters( 'bp_has_groups', $groups_template->has_groups(), &$groups_template );
+    return apply_filters( 'bp_has_groups', $groups_template->has_groups(), $groups_template );
 }
 
@@ -1383 +1383 @@
 
     $members_template = new BP_Groups_Group_Members_Template( $group_id, $per_page, $max, (int)$exclude_admins_mods, (int)$exclude_banned, $exclude );
-    return apply_filters( 'bp_group_has_members', $members_template->has_members(), &$members_template );
+    return apply_filters( 'bp_group_has_members', $members_template->has_members(), $members_template );
 }
 
@@ -2063 +2063 @@
 
     $requests_template = new BP_Groups_Membership_Requests_Template( $group_id, $per_page, $max );
-    return apply_filters( 'bp_group_has_membership_requests', $requests_template->has_requests(), &$requests_template );
+    return apply_filters( 'bp_group_has_membership_requests', $requests_template->has_requests(), $requests_template );
 }
 
@@ -2217 +2217 @@
 
     $invites_template = new BP_Groups_Invite_Template( $user_id, $group_id );
-    return apply_filters( 'bp_group_has_invites', $invites_template->has_invites(), &$invites_template );
+    return apply_filters( 'bp_group_has_invites', $invites_template->has_invites(), $invites_template );
 }
 

trunk/bp-messages/bp-messages-templatetags.php

@@ -177 +177 @@
     }
 
-    return apply_filters( 'bp_has_message_threads', $messages_template->has_threads(), &$messages_template );
+    return apply_filters( 'bp_has_message_threads', $messages_template->has_threads(), $messages_template );
 }
 

trunk/bp-xprofile/bp-xprofile-templatetags.php

@@ -159 +159 @@
 
     $profile_template = new BP_XProfile_Data_Template( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields );
-    return apply_filters( 'bp_has_profile', $profile_template->has_groups(), &$profile_template );
+    return apply_filters( 'bp_has_profile', $profile_template->has_groups(), $profile_template );
 }