<!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][5575] trunk/bp-core: Fix forum settings link in admin, and revert other admin slugs back to their 1.5 names.</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/5575">5575</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-12-20 15:43:16 +0000 (Tue, 20 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix forum settings link in admin, and revert other admin slugs back to their 1.5 names. See <a href="http://buddypress.trac.wordpress.org/ticket/3840">#3840</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcorefunctionsphp">trunk/bp-core/admin/bp-core-functions.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreslugsphp">trunk/bp-core/admin/bp-core-slugs.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
<li><a href="#trunkbpcorebpcoreadminphp">trunk/bp-core/bp-core-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-functions.php (5574 => 5575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-functions.php 2011-12-19 22:48:35 UTC (rev 5574)
+++ trunk/bp-core/admin/bp-core-functions.php 2011-12-20 15:43:16 UTC (rev 5575)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> $page = bp_core_do_network_admin() ? 'settings.php' : 'options-general.php';
</span><span class="cx">
</span><span class="cx"> remove_submenu_page( $page, 'bb-forums-setup' );
</span><del>- remove_submenu_page( $page, 'bp-slugs' );
</del><ins>+ remove_submenu_page( $page, 'bp-page-settings' );
</ins><span class="cx"> remove_submenu_page( $page, 'bp-settings' );
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_head', 'bp_core_modify_admin_menu', 999 );
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty( $orphaned_components ) ) {
</span><del>- $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-slugs' ), 'admin.php' ) );
</del><ins>+ $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), 'admin.php' ) );
</ins><span class="cx"> $notice = sprintf( __( 'The following active BuddyPress Components do not have associated WordPress Pages: %2$s. <a href="%1$s" class="button-secondary">Repair</a>', 'buddypress' ), $admin_url, '<strong>' . implode( '</strong>, <strong>', $orphaned_components ) . '</strong>' );
</span><span class="cx">
</span><span class="cx"> bp_core_add_admin_notice( $notice );
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx">
</span><span class="cx"> // If there are duplicates, post a message about them
</span><span class="cx"> if ( !empty( $dupe_names ) ) {
</span><del>- $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-slugs' ), 'admin.php' ) );
</del><ins>+ $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), 'admin.php' ) );
</ins><span class="cx"> $notice = sprintf( __( 'Each BuddyPress Component needs its own WordPress page. The following WordPress Pages have more than one component associated with them: %2$s. <a href="%1$s" class="button-secondary">Repair</a>', 'buddypress' ), $admin_url, '<strong>' . implode( '</strong>, <strong>', $dupe_names ) . '</strong>' );
</span><span class="cx">
</span><span class="cx"> bp_core_add_admin_notice( $notice );
</span><span class="lines">@@ -351,19 +351,19 @@
</span><span class="cx">
</span><span class="cx"> /* Settings Icon */
</span><span class="cx"> ul#adminmenu li.toplevel_page_bp-components .wp-menu-image a img,
</span><del>- ul#adminmenu li.toplevel_page_bp-settings .wp-menu-image a img {
</del><ins>+ ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ul#adminmenu li.toplevel_page_bp-components .wp-menu-image a,
</span><del>- ul#adminmenu li.toplevel_page_bp-settings .wp-menu-image a {
</del><ins>+ ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a {
</ins><span class="cx"> background-image: url( <?php echo plugins_url( 'buddypress/bp-core/images/admin_menu_icon.png' ) ?> ) !important; background-position: -1px -32px;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ul#adminmenu li.toplevel_page_bp-components:hover .wp-menu-image a,
</span><del>- ul#adminmenu li.toplevel_page_bp-settings:hover .wp-menu-image a,
</del><ins>+ ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a,
</ins><span class="cx"> ul#adminmenu li.toplevel_page_bp-components.wp-has-current-submenu .wp-menu-image a,
</span><del>- ul#adminmenu li.toplevel_page_bp-settings.wp-has-current-submenu .wp-menu-image a {
</del><ins>+ ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image a {
</ins><span class="cx"> background-position: -1px 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx"> 'name' => __( 'Components', 'buddypress' )
</span><span class="cx"> ),
</span><span class="cx"> '1' => array(
</span><del>- 'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-slugs' ), 'admin.php' ) ),
</del><ins>+ 'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), 'admin.php' ) ),
</ins><span class="cx"> 'name' => __( 'Permalinks', 'buddypress' )
</span><span class="cx"> ),
</span><span class="cx"> '2' => array(
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> // If forums component is active, add additional tab
</span><span class="cx"> if ( bp_is_active( 'forums' ) ) {
</span><span class="cx"> $tabs['3'] = array(
</span><del>- 'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-forums' ), 'admin.php' ) ),
</del><ins>+ 'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bb-forums-setup' ), 'admin.php' ) ),
</ins><span class="cx"> 'name' => __( 'Forums', 'buddypress' )
</span><span class="cx"> );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreslugsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-slugs.php (5574 => 5575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-slugs.php 2011-12-19 22:48:35 UTC (rev 5574)
+++ trunk/bp-core/admin/bp-core-slugs.php 2011-12-20 15:43:16 UTC (rev 5575)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> bp_core_update_directory_page_ids( $directory_pages );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $base_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-slugs', 'updated' => 'true' ), 'admin.php' ) );
</del><ins>+ $base_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings', 'updated' => 'true' ), 'admin.php' ) );
</ins><span class="cx">
</span><span class="cx"> wp_redirect( $base_url );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpcoreadminbpcoreupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-update.php (5574 => 5575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2011-12-19 22:48:35 UTC (rev 5574)
+++ trunk/bp-core/admin/bp-core-update.php 2011-12-20 15:43:16 UTC (rev 5575)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> do_action( 'bp_admin_notices' );
</span><span class="cx">
</span><span class="cx"> $step_count = count( $this->steps ) - 1;
</span><del>- $wiz_or_set = $this->current_step >= $step_count ? 'bp-general-config' : 'bp-wizard';
</del><ins>+ $wiz_or_set = $this->current_step >= $step_count ? 'bp-components' : 'bp-wizard';
</ins><span class="cx"> $form_action = bp_core_update_do_network_admin() ? network_admin_url( add_query_arg( array( 'page' => $wiz_or_set ), 'admin.php' ) ) : admin_url( add_query_arg( array( 'page' => $wiz_or_set ), 'admin.php' ) );
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="lines">@@ -1160,7 +1160,7 @@
</span><span class="cx"> bp_core_add_admin_menu();
</span><span class="cx">
</span><span class="cx"> // Redirect to the BuddyPress dashboard
</span><del>- $redirect = bp_core_update_do_network_admin() ? add_query_arg( array( 'page' => 'bp-general-config' ), network_admin_url( 'settings.php' ) ) : add_query_arg( array( 'page' => 'bp-general-config' ), admin_url( 'options-general.php' ) );
</del><ins>+ $redirect = bp_core_update_do_network_admin() ? add_query_arg( array( 'page' => 'bp-components' ), network_admin_url( 'settings.php' ) ) : add_query_arg( array( 'page' => 'bp-components' ), admin_url( 'options-general.php' ) );
</ins><span class="cx">
</span><span class="cx"> wp_redirect( $redirect );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-admin.php (5574 => 5575)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-admin.php 2011-12-19 22:48:35 UTC (rev 5574)
+++ trunk/bp-core/bp-core-admin.php 2011-12-20 15:43:16 UTC (rev 5575)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> __( 'BuddyPress Pages', 'buddypress' ),
</span><span class="cx"> __( 'BuddyPress Pages', 'buddypress' ),
</span><span class="cx"> 'manage_options',
</span><del>- 'bp-slugs',
</del><ins>+ 'bp-page-settings',
</ins><span class="cx"> 'bp_core_admin_slugs_settings'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>