<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][6157] trunk/bp-core/admin/bp-core-settings.php: Removing bp_form_slug_conflict_check() for 1.6.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/6157">6157</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-06-30 13:30:19 +0000 (Sat, 30 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removing bp_form_slug_conflict_check() for 1.6. See <a href="http://buddypress.trac.wordpress.org/ticket/2086">#2086</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoresettingsphp">trunk/bp-core/admin/bp-core-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoresettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-settings.php (6156 => 6157)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-settings.php 2012-06-30 13:26:18 UTC (rev 6156)
+++ trunk/bp-core/admin/bp-core-settings.php 2012-06-30 13:30:19 UTC (rev 6157)
</span><span class="lines">@@ -336,106 +336,4 @@
</span><span class="cx"> // Allow plugins to further filter the output
</span><span class="cx"> return apply_filters( 'bp_get_form_option', $value, $option );
</span><span class="cx"> }
</span><del>-
-/**
- * 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;
- }
-}
-
</del><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>