Changeset 6157

Timestamp:

06/30/2012 01:30:19 PM (14 years ago)

Author:

djpaul

Message:

Removing bp_form_slug_conflict_check() for 1.6. See #2086

File:

• trunk/bp-core/admin/bp-core-settings.php (modified) (1 diff)

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

@@ -337 +337 @@
                 return apply_filters( 'bp_get_form_option', $value, $option );
         }
-
-/**
- * Used to check if a BuddyPress slug conflicts with an existing known slug.
- *
- * @since BuddyPress (1.6)
- *
- * @param string $slug
- * @param string $default
- *
- * @uses bp_get_form_option() To get a sanitized slug string
- */
-function bp_form_slug_conflict_check( $slug, $default ) {
-
-        // Only set the slugs once ver page load
-        static $the_core_slugs = array();
-
-        // Get the form value
-        $this_slug = bp_get_form_option( $slug, $default, true );
-
-        if ( empty( $the_core_slugs ) ) {
-
-                // Slugs to check
-                $core_slugs = apply_filters( 'bp_slug_conflict_check', array(
-
-                        /** WordPress Core ****************************************************/
-
-                        // Core Post Types
-                        'post_base'       => array( 'name' => __( 'Posts'         ), 'default' => 'post',          'context' => 'WordPress' ),
-                        'page_base'       => array( 'name' => __( 'Pages'         ), 'default' => 'page',          'context' => 'WordPress' ),
-                        'revision_base'   => array( 'name' => __( 'Revisions'     ), 'default' => 'revision',      'context' => 'WordPress' ),
-                        'attachment_base' => array( 'name' => __( 'Attachments'   ), 'default' => 'attachment',    'context' => 'WordPress' ),
-                        'nav_menu_base'   => array( 'name' => __( 'Menus'         ), 'default' => 'nav_menu_item', 'context' => 'WordPress' ),
-
-                        // Post Tags
-                        'tag_base'        => array( 'name' => __( 'Tag base'      ), 'default' => 'tag',           'context' => 'WordPress' ),
-
-                        // Post Categories
-                        'category_base'   => array( 'name' => __( 'Category base' ), 'default' => 'category',      'context' => 'WordPress' ),
-
-                ) );
-
-                /** bbPress Core ******************************************************/
-
-                if ( bp_forums_is_bbpress_active() ) {
-
-                        // Forum archive slug
-                        $core_slugs['_bbp_root_slug']          = array( 'name' => __( 'Forums base', 'buddypress' ), 'default' => 'forums', 'context' => 'buddypress' );
-
-                        // Topic archive slug
-                        $core_slugs['_bbp_topic_archive_slug'] = array( 'name' => __( 'Topics base', 'buddypress' ), 'default' => 'topics', 'context' => 'buddypress' );
-
-                        // Forum slug
-                        $core_slugs['_bbp_forum_slug']         = array( 'name' => __( 'Forum slug',  'buddypress' ), 'default' => 'forum',  'context' => 'buddypress' );
-
-                        // Topic slug
-                        $core_slugs['_bbp_topic_slug']         = array( 'name' => __( 'Topic slug',  'buddypress' ), 'default' => 'topic',  'context' => 'buddypress' );
-
-                        // Reply slug
-                        $core_slugs['_bbp_reply_slug']         = array( 'name' => __( 'Reply slug',  'buddypress' ), 'default' => 'reply',  'context' => 'buddypress' );
-
-                        // User profile slug
-                        $core_slugs['_bbp_user_slug']          = array( 'name' => __( 'User base',   'buddypress' ), 'default' => 'users',  'context' => 'buddypress' );
-
-                        // View slug
-                        $core_slugs['_bbp_view_slug']          = array( 'name' => __( 'View base',   'buddypress' ), 'default' => 'view',   'context' => 'buddypress' );
-
-                        // Topic tag slug
-                        $core_slugs['_bbp_topic_tag_slug']     = array( 'name' => __( 'Topic tag slug', 'buddypress' ), 'default' => 'topic-tag', 'context' => 'buddypress' );
-                }
-
-                /** BuddyPress Core *******************************************************/
-
-                global $bp;
-
-                // Loop through root slugs and check for conflict
-                if ( !empty( $bp->pages ) ) {
-                        foreach ( $bp->pages as $page => $page_data ) {
-                                $page_base    = $page . '_base';
-                                $page_title   = sprintf( __( '%s page', 'buddypress' ), $page_data->title );
-                                $core_slugs[$page_base] = array( 'name' => $page_title, 'default' => $page_data->slug, 'context' => 'buddypress' );
-                        }
-                }
-
-                // Set the static
-                $the_core_slugs = apply_filters( 'bp_slug_conflict', $core_slugs );
-        }
-
-        // Loop through slugs to check
-        foreach( $the_core_slugs as $key => $value ) {
-
-                // Get the slug
-                $slug_check = bp_get_form_option( $key, $value['default'], true );
-
-                // Compare
-                if ( ( $slug != $key ) && ( $slug_check == $this_slug ) ) : ?>
-
-                        <span class="attention"><?php printf( __( 'Possible %1$s conflict: <strong>%2$s</strong>', 'buddypress' ), $value['context'], $value['name'] ); ?></span>
-
-                <?php endif;
-        }
-}
-
-?>
+?>