Changeset 8602

Timestamp:

07/12/2014 12:49:05 AM (10 years ago)

Author:

boonebgorges

Message:

Undeprecate bp_force_buddybar()

The change introduced in r8579 means that bp_force_buddybar() is still used in
a BP core function, and thus should not be deprecated. (If kept in the
deprecated functions file, a fatal error is caused when these files are not
loaded.)

See #5390

Location:

trunk/src/bp-core

Files:

• bp-core-options.php (modified) (1 diff)
• deprecated/2.1.php (modified) (1 diff)

trunk/src/bp-core/bp-core-options.php

@@ -519 +519 @@
 function bp_restrict_group_creation( $default = true ) {
     return (bool) apply_filters( 'bp_restrict_group_creation', (bool) bp_get_option( 'bp_restrict_group_creation', $default ) );
+}
+
+/**
+ * Should the old BuddyBar be forced in place of the WP admin bar?
+ *
+ * @since BuddyPress (1.6.0)
+ *
+ * @uses bp_get_option() To get the BuddyBar option.
+ *
+ * @param bool $default Optional. Fallback value if not found in the database.
+ *        Default: true.
+ * @return bool True if the BuddyBar should be forced on, otherwise false.
+ */
+function bp_force_buddybar( $default = true ) {
+    return (bool) apply_filters( 'bp_force_buddybar', (bool) bp_get_option( '_bp_force_buddybar', $default ) );
 }
 

trunk/src/bp-core/deprecated/2.1.php

@@ -360 +360 @@
 }
 add_action( 'bp_init', 'bp_core_load_buddybar_css' );
-
-/**
- * Should the old BuddyBar be forced in place of the WP admin bar?
- *
- * @since BuddyPress (1.6.0)
- * @deprecated BuddyPress (2.1.0)
- *
- * @uses bp_get_option() To get the BuddyBar option.
- *
- * @param bool $default Optional. Fallback value if not found in the database.
- *        Default: true.
- * @return bool True if the BuddyBar should be forced on, otherwise false.
- */
-function bp_force_buddybar( $default = true ) {
-    return (bool) apply_filters( 'bp_force_buddybar', (bool) bp_get_option( '_bp_force_buddybar', $default ) );
-}
 
 /**