Ticket #8146: 8146.2.patch

src/bp-core/deprecated/6.0.php

@@ -85 +85 @@
 
         bp_members_screen_change_avatar();
 }
+
+/**
+ * Output the status of the current group in the loop.
+ *
+ * Either 'Public' or 'Private'.
+ *
+ * @since 1.0.0
+ * @deprecated 6.0.0 Not used anymore.
+ *
+ * @param object|bool $group Optional. Group object.
+ *                           Default: current group in loop.
+ */
+function bp_group_public_status( $group = false ) {
+        _deprecated_function( __FUNCTION__, '6.0' );
+}
+        /**
+         * Return the status of the current group in the loop.
+         *
+         * Either 'Public' or 'Private'.
+         *
+         * @since 1.0.0
+         * @deprecated 6.0.0 Not used anymore.
+         *
+         * @param object|bool $group Optional. Group object.
+         *                           Default: current group in loop.
+         * @return string
+         */
+        function bp_get_group_public_status( $group = false ) {
+                _deprecated_function( __FUNCTION__, '6.0' );
+        }
+
+/**
+ * Output whether the current group in the loop is public.
+ *
+ * No longer used in BuddyPress.
+ *
+ * @deprecated 6.0.0 Not used anymore.
+ *
+ * @param object|bool $group Optional. Group object.
+ *                           Default: current group in loop.
+ */
+function bp_group_is_public( $group = false ) {
+        _deprecated_function( __FUNCTION__, '6.0' );
+}
+        /**
+         * Return whether the current group in the loop is public.
+         *
+         * No longer used in BuddyPress.
+         *
+         * @deprecated 6.0.0 Not used anymore.
+         *
+         * @param object|bool $group Optional. Group object.
+         *                           Default: current group in loop.
+         * @return mixed
+         */
+        function bp_get_group_is_public( $group = false ) {
+                _deprecated_function( __FUNCTION__, '6.0' );
+        }

src/bp-groups/bp-groups-template.php

@@ -1301 +1301 @@
                 return apply_filters( 'bp_get_group_description_excerpt', bp_create_excerpt( $group->description, $length ), $group );
         }
 
-/**
- * Output the status of the current group in the loop.
- *
- * Either 'Public' or 'Private'.
- *
- * @since 1.0.0
- *
- * @param object|bool $group Optional. Group object.
- *                           Default: current group in loop.
- */
-function bp_group_public_status( $group = false ) {
-        echo bp_get_group_public_status( $group );
-}
-        /**
-         * Return the status of the current group in the loop.
-         *
-         * Either 'Public' or 'Private'.
-         *
-         * @since 1.0.0
-         *
-         * @param object|bool $group Optional. Group object.
-         *                           Default: current group in loop.
-         * @return string
-         */
-        function bp_get_group_public_status( $group = false ) {
-                global $groups_template;
-
-                if ( empty( $group ) ) {
-                        $group =& $groups_template->group;
-                }
-
-                if ( $group->is_public ) {
-                        return __( 'Public', 'buddypress' );
-                } else {
-                        return __( 'Private', 'buddypress' );
-                }
-        }
-
-/**
- * Output whether the current group in the loop is public.
- *
- * No longer used in BuddyPress.
- *
- * @param object|bool $group Optional. Group object.
- *                           Default: current group in loop.
- */
-function bp_group_is_public( $group = false ) {
-        echo bp_get_group_is_public( $group );
-}
-        /**
-         * Return whether the current group in the loop is public.
-         *
-         * No longer used in BuddyPress.
-         *
-         * @param object|bool $group Optional. Group object.
-         *                           Default: current group in loop.
-         * @return mixed
-         */
-        function bp_get_group_is_public( $group = false ) {
-                global $groups_template;
-
-                if ( empty( $group ) ) {
-                        $group =& $groups_template->group;
-                }
-
-                /**
-                 * Filters whether the current group in the loop is public.
-                 *
-                 * @since 2.5.0 Added the `$group` parameter.
-                 *
-                 * @param bool   $public True if the group is public.
-                 * @param object $group Group object.
-                 */
-                return apply_filters( 'bp_get_group_is_public', $group->is_public, $group );
-        }
-
 /**
  * Output the created date of the current group in the loop.
  *

src/class-buddypress.php

@@ -508 +508 @@
                         require( $this->plugin_dir . 'bp-core/deprecated/2.9.php' );
                         require( $this->plugin_dir . 'bp-core/deprecated/3.0.php' );
                         require( $this->plugin_dir . 'bp-core/deprecated/4.0.php' );
+                        require( $this->plugin_dir . 'bp-core/deprecated/6.0.php' );
                 }
 
                 // Load wp-cli module if PHP 5.4+.