Changeset 2695 for trunk/bp-groups/bp-groups-templatetags.php

Timestamp:

02/12/2010 12:31:49 PM (15 years ago)

Author:

apeatling

Message:

Fixing the use of deprecated template tags in bp-default. Merged the fetching of BP runtime settings into one query to significantly reduce the number of run time database hits. Fixed #1916

File:

• trunk/bp-groups/bp-groups-templatetags.php (modified) (26 diffs)

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

@@ -255 +255 @@
 }
 
-
-function bp_group_id( $deprecated = true, $deprecated2 = false ) {
-    global $groups_template;
-
-    if ( !$deprecated )
-        return bp_get_group_id();
-    else
-        echo bp_get_group_id();
+function bp_group_id() {
+    echo bp_get_group_id();
 }
     function bp_get_group_id( $group = false ) {
@@ -273 +267 @@
     }
 
-function bp_group_name( $deprecated = true, $deprecated2 = false ) {
-    global $groups_template;
-
-    if ( !$deprecated )
-        return bp_get_group_name();
-    else
-        echo bp_get_group_name();
+function bp_group_name() {
+    echo bp_get_group_name();
 }
     function bp_get_group_name( $group = false ) {
@@ -363 +352 @@
     }
 
-function bp_group_last_active( $deprecated = true, $deprecated2 = false ) {
-    if ( !$deprecated )
-        return bp_get_group_last_active();
-    else
-        echo bp_get_group_last_active();
+function bp_group_last_active() {
+    echo bp_get_group_last_active();
 }
     function bp_get_group_last_active( $group = false ) {
@@ -387 +373 @@
     }
 
-function bp_group_permalink( $deprecated = false, $deprecated2 = true ) {
-    if ( !$deprecated2 )
-        return bp_get_group_permalink();
-    else
-        echo bp_get_group_permalink();
+function bp_group_permalink() {
+    echo bp_get_group_permalink();
 }
     function bp_get_group_permalink( $group = false ) {
@@ -402 +385 @@
     }
 
-function bp_group_admin_permalink( $deprecated = true, $deprecated2 = false ) {
-    if ( !$deprecated )
-        return bp_get_group_admin_permalink();
-    else
-        echo bp_get_group_admin_permalink();
+function bp_group_admin_permalink() {
+    echo bp_get_group_admin_permalink();
 }
     function bp_get_group_admin_permalink( $group = false ) {
@@ -429 +409 @@
     }
 
-function bp_group_description( $deprecated = false, $deprecated2 = true ) {
-    if ( !$deprecated2 )
-        return bp_get_group_description();
-    else
-        echo bp_get_group_description();
+function bp_group_description() {
+    echo bp_get_group_description();
 }
     function bp_get_group_description( $group = false ) {
@@ -444 +421 @@
     }
 
-function bp_group_description_editable( $deprecated = false ) {
+function bp_group_description_editable() {
     echo bp_get_group_description_editable();
 }
@@ -456 +433 @@
     }
 
-function bp_group_description_excerpt( $deprecated = false ) {
+function bp_group_description_excerpt() {
     echo bp_get_group_description_excerpt();
 }
@@ -469 +446 @@
 
 
-function bp_group_public_status( $deprecated = false ) {
+function bp_group_public_status() {
     echo bp_get_group_public_status();
 }
@@ -485 +462 @@
     }
 
-function bp_group_is_public( $deprecated = false ) {
+function bp_group_is_public() {
     echo bp_get_group_is_public();
 }
@@ -497 +474 @@
     }
 
-function bp_group_date_created( $deprecated = false ) {
+function bp_group_date_created() {
     echo bp_get_group_date_created();
 }
@@ -521 +498 @@
 }
 
-function bp_group_list_admins( $deprecated = true, $group = false ) {
+function bp_group_list_admins( $group = false ) {
     global $groups_template;
 
@@ -541 +518 @@
 }
 
-function bp_group_list_mods( $deprecated = true, $group = false ) {
+function bp_group_list_mods( $group = false ) {
     global $groups_template;
 
@@ -561 +538 @@
 }
 
-function bp_group_all_members_permalink( $deprecated = true, $deprecated2 = false ) {
-    global $groups_template, $bp;
-
-    if ( !$group )
-        $group =& $groups_template->group;
-
-    if ( !$deprecated )
-        return bp_get_group_all_members_permalink();
-    else
-        echo bp_get_group_all_members_permalink();
+function bp_group_all_members_permalink() {
+    echo bp_get_group_all_members_permalink();
 }
     function bp_get_group_all_members_permalink( $group = false ) {
@@ -636 +605 @@
 }
 
-function bp_group_total_members( $deprecated = true, $deprecated2 = false ) {
-    if ( !$deprecated )
-        return bp_get_group_total_members();
-    else
-        echo bp_get_group_total_members();
-}
-    function bp_get_group_total_members( $echo = true, $group = false ) {
+function bp_group_total_members() {
+    echo bp_get_group_total_members();
+}
+    function bp_get_group_total_members( $group = false ) {
         global $groups_template;
 
@@ -663 +629 @@
     }
 
-function bp_group_forum_permalink( $deprecated = false ) {
+function bp_group_forum_permalink() {
     echo bp_get_group_forum_permalink();
 }
@@ -902 +868 @@
     }
 
-function bp_group_member_demote_link( $user_id = false, $deprecated = false ) {
+function bp_group_member_demote_link( $user_id = false ) {
     global $members_template;
 
@@ -922 +888 @@
     }
 
-function bp_group_member_ban_link( $user_id = false, $deprecated = false ) {
+function bp_group_member_ban_link( $user_id = false ) {
     global $members_template;
 
@@ -939 +905 @@
     }
 
-function bp_group_member_unban_link( $user_id = false, $deprecated = false ) {
+function bp_group_member_unban_link( $user_id = false ) {
     global $members_template;
 
@@ -996 +962 @@
     }
 
-function bp_group_form_action( $page, $deprecated = false ) {
+function bp_group_form_action( $page ) {
     echo bp_get_group_form_action( $page );
 }
@@ -1008 +974 @@
     }
 
-function bp_group_admin_form_action( $page = false, $deprecated = false ) {
+function bp_group_admin_form_action( $page = false ) {
     echo bp_get_group_admin_form_action( $page );
 }
@@ -1050 +1016 @@
 }
 
-function bp_group_accept_invite_link( $deprecated = false ) {
+function bp_group_accept_invite_link() {
     echo bp_get_group_accept_invite_link();
 }
@@ -1062 +1028 @@
     }
 
-function bp_group_reject_invite_link( $deprecated = false ) {
+function bp_group_reject_invite_link() {
     echo bp_get_group_reject_invite_link();
 }
@@ -1074 +1040 @@
     }
 
-function bp_group_leave_confirm_link( $deprecated = false ) {
+function bp_group_leave_confirm_link() {
     echo bp_get_group_leave_confirm_link();
 }
@@ -1086 +1052 @@
     }
 
-function bp_group_leave_reject_link( $deprecated = false ) {
+function bp_group_leave_reject_link() {
     echo bp_get_group_leave_reject_link();
 }
@@ -1098 +1064 @@
     }
 
-function bp_group_send_invite_form_action( $deprecated = false ) {
+function bp_group_send_invite_form_action() {
     echo bp_get_group_send_invite_form_action();
 }