Changeset 6066

Timestamp:

06/08/2012 09:44:34 PM (14 years ago)

Author:

djpaul

Message:

Remove some more copypasta that came from/belongs in bbPress. See #4008.

• The 'Root forum ID for groups' belongs to bbPress.
• Don't serialise 'bp-deactivated-components'.
• Remove 'Use WP Editor' option until/if we decide to integrate TinyMCE into any BP component.

Location:

trunk/bp-core

Files:

• admin/bp-core-settings.php (modified) (1 diff)
• bp-core-options.php (modified) (4 diffs)

trunk/bp-core/admin/bp-core-settings.php

@@ -46 +46 @@
     <input id="bp-disable-account-deletion" name="bp-disable-account-deletion" type="checkbox" value="1" <?php checked( !bp_disable_account_deletion( true ) ); ?> />
     <label for="bp-disable-account-deletion"><?php _e( 'Allow registered members to delete their own accounts', 'buddypress' ); ?></label>
-
-<?php
-}
-
-/**
- * Use the WordPress editor setting field
- *
- * @since BuddyPress (r3586)
- *
- * @uses checked() To display the checked attribute
- */
-function bp_admin_setting_callback_use_wp_editor() {
-?>
-
-    <input id="_bp_use_wp_editor" name="_bp_use_wp_editor" type="checkbox" id="_bp_use_wp_editor" value="1" <?php checked( bp_use_wp_editor( true ) ); ?> />
-    <label for="_bp_use_wp_editor"><?php _e( 'Use the fancy WordPress editor to create and edit topics and replies', 'buddypress' ); ?></label>
 
 <?php

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

@@ -25 +25 @@
         /** Components ********************************************************/
 
-        'bp-deactivated-components'       => serialize( array() ),
+        'bp-deactivated-components'       => array(),
 
         /** bbPress ***********************************************************/
@@ -62 +62 @@
         'bp-disable-blogforum-comments'   => true,
 
-        // Use the WordPress editor when possible
-        '_bp_use_wp_editor'               => false,
-
         /** Groups ************************************************************/
 
@@ -71 +68 @@
         // Restrict group creation to super admins
         'bp_restrict_group_creation'      => false,
-
-        // Root forum ID for groups
-        '_bbp_group_forums_root_id'       => 0,
 
         /** Akismet ***********************************************************/
@@ -474 +468 @@
 function bp_force_buddybar( $default = true ) {
     return (bool) apply_filters( 'bp_force_buddybar', (bool) bp_get_option( '_bp_force_buddybar', $default ) );
-}
-
-/**
- * Use the WordPress editor if available
- *
- * @since BuddyPress (r3386)
- *
- * @param $default bool Optional. Default value true
- *
- * @uses bp_get_option() To get the WP editor option
- * @return bool Use WP editor?
- */
-function bp_use_wp_editor( $default = true ) {
-    return (bool) apply_filters( 'bp_use_wp_editor', (bool) bp_get_option( '_bp_use_wp_editor', $default ) );
 }