<!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][5406] trunk: Relocates the top-level BuddyPress admin menu to under the Settings and Users menus.</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/5406">5406</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-11-28 22:30:03 +0000 (Mon, 28 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Relocates the top-level BuddyPress admin menu to under the Settings and Users menus. Maintains compatibility with third-party plugins that add their admin menus under the old top-level BP menu. See <a href="http://buddypress.trac.wordpress.org/ticket/3708">#3708</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreadminphp">trunk/bp-core/admin/bp-core-admin.php</a></li>
<li><a href="#trunkbpcoreadminbpcoreupdatephp">trunk/bp-core/admin/bp-core-update.php</a></li>
<li><a href="#trunkbpcorebpcorecssjsphp">trunk/bp-core/bp-core-cssjs.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbpforumsbpforumsadminphp">trunk/bp-forums/bp-forums-admin.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileadminphp">trunk/bp-xprofile/bp-xprofile-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-admin.php (5405 => 5406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-admin.php 2011-11-28 15:50:02 UTC (rev 5405)
+++ trunk/bp-core/admin/bp-core-admin.php 2011-11-28 22:30:03 UTC (rev 5406)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> // Setup core admin tabs
</span><span class="cx"> $tabs = array(
</span><span class="cx"> '0' => array(
</span><del>- 'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-general-settings' ), 'admin.php' ) ),
</del><ins>+ 'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-general-config' ), 'admin.php' ) ),
</ins><span class="cx"> 'name' => __( 'Components', 'buddypress' )
</span><span class="cx"> ),
</span><span class="cx"> '1' => array(
</span><span class="lines">@@ -64,6 +64,27 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Generates markup for a fallback top-level BuddyPress menu page, if the site is running
+ * a legacy plugin which hasn't been updated. If the site is up to date, this page
+ * will never appear.
+ *
+ * @see bp_core_admin_backpat_menu()
+ * @since 1.6
+ * @todo Add convenience links into the markup once new positions are finalised.
+ */
+function bp_core_admin_backpat_page() {
+?>
+ <div class="wrap">
+ <?php screen_icon( 'buddypress'); ?>
+ <h2><?php _e( 'Why have all my BuddyPress menus disappeared?', 'buddypress' ); ?></h2>
+
+ <p><?php _e( "Don't worry! We've moved the BuddyPress options into more convenient and easier to find locations. You're seeing this page because you are running a legacy BuddyPress plugin which has not been updated.", 'buddypress' ); ?></p>
+ <p><?php printf( __( 'Components, Pages, Settings, and Forums, have been moved to <a href="%s">Settings &gt; BuddyPress</a>. Profile Fields has been moved into the <a href="%s">Users</a> menu.', 'buddpress' ), network_admin_url( 'options-general.php?page=bp-general-config' ), network_admin_url( 'users.php?page=bp-profile-setup' ) ); ?></p>
+ </div>
+<?php
+}
+
+/**
</ins><span class="cx"> * Renders the Settings admin panel.
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><span class="lines">@@ -217,7 +238,7 @@
</span><span class="cx"> bp_update_option( 'bp-active-components', $bp->active_components );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $base_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-general-settings', 'updated' => 'true' ), 'admin.php' ) );
</del><ins>+ $base_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-general-config', '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 (5405 => 5406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-update.php 2011-11-28 15:50:02 UTC (rev 5405)
+++ trunk/bp-core/admin/bp-core-update.php 2011-11-28 22:30:03 UTC (rev 5406)
</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-settings' : 'bp-wizard';
</del><ins>+ $wiz_or_set = $this->current_step >= $step_count ? 'bp-general-config' : '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">@@ -1133,7 +1133,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-settings' ), network_admin_url( 'admin.php' ) ) : add_query_arg( array( 'page' => 'bp-general-settings' ), admin_url( 'admin.php' ) );
</del><ins>+ $redirect = bp_core_update_do_network_admin() ? add_query_arg( array( 'page' => 'bp-general-config' ), network_admin_url( 'admin.php' ) ) : add_query_arg( array( 'page' => 'bp-general-config' ), admin_url( 'admin.php' ) );
</ins><span class="cx">
</span><span class="cx"> wp_redirect( $redirect );
</span><span class="cx">
</span><span class="lines">@@ -1354,10 +1354,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Settings Icon */
</span><del>- ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img { display: none; }
- ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a { background-image: url( <?php echo plugins_url( 'buddypress/bp-core/images/admin_menu_icon.png' ) ?> ) !important; background-position: -1px -32px; }
- ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a,
- ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image a {
</del><ins>+ ul#adminmenu li.toplevel_page_bp-general-config .wp-menu-image a img { display: none; }
+ ul#adminmenu li.toplevel_page_bp-general-config .wp-menu-image a { background-image: url( <?php echo plugins_url( 'buddypress/bp-core/images/admin_menu_icon.png' ) ?> ) !important; background-position: -1px -32px; }
+ ul#adminmenu li.toplevel_page_bp-general-config:hover .wp-menu-image a,
+ ul#adminmenu li.toplevel_page_bp-general-config.wp-has-current-submenu .wp-menu-image a {
</ins><span class="cx"> background-position: -1px 0;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span></span></pre></div>
<a id="trunkbpcorebpcorecssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-cssjs.php (5405 => 5406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-cssjs.php 2011-11-28 15:50:02 UTC (rev 5405)
+++ trunk/bp-core/bp-core-cssjs.php 2011-11-28 22:30:03 UTC (rev 5406)
</span><span class="lines">@@ -22,9 +22,19 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Settings Icon */
</span><del>- ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img { display: none; }
- ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a { background-image: url( <?php echo plugins_url( 'buddypress/bp-core/images/admin_menu_icon.png' ) ?> ) !important; background-position: -1px -32px; }
</del><ins>+ ul#adminmenu li.toplevel_page_bp-general-config .wp-menu-image a img,
+ ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img {
+ display: none;
+ }
+
+ ul#adminmenu li.toplevel_page_bp-general-config .wp-menu-image a,
+ ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a {
+ background-image: url( <?php echo plugins_url( 'buddypress/bp-core/images/admin_menu_icon.png' ) ?> ) !important; background-position: -1px -32px;
+ }
+
+ ul#adminmenu li.toplevel_page_bp-general-config:hover .wp-menu-image a,
</ins><span class="cx"> ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a,
</span><ins>+ ul#adminmenu li.toplevel_page_bp-general-config.wp-has-current-submenu .wp-menu-image a,
</ins><span class="cx"> ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image a {
</span><span class="cx"> background-position: -1px 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (5405 => 5406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-11-28 15:50:02 UTC (rev 5405)
+++ trunk/bp-core/bp-core-functions.php 2011-11-28 22:30:03 UTC (rev 5406)
</span><span class="lines">@@ -284,36 +284,112 @@
</span><span class="cx"> add_action( 'bp_init', 'bp_core_admin_menu_init' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Adds the "BuddyPress" admin submenu item to the Site Admin tab.
</del><ins>+ * In BP 1.6, the top-level admin menu was removed. For backpat, this function
+ * keeps the top-level menu if a plugin has registered a menu into the old
+ * 'bp-general-settings' menu.
</ins><span class="cx"> *
</span><del>- * @package BuddyPress Core
- * @global object $bp Global BuddyPress settings object
- * @uses bp_current_user_can() returns true if the current user is a site admin, false if not
- * @uses add_submenu_page() WP function to add a submenu item
</del><ins>+ * The old "bp-general-settings" page was renamed "bp-general-config".
+ *
+ * @global array $_parent_pages
+ * @global array $_registered_pages
+ * @global array $submenu
+ * @since 1.6
</ins><span class="cx"> */
</span><ins>+function bp_core_admin_backpat_menu() {
+ global $_parent_pages, $_registered_pages, $submenu;
+
+ if ( ! is_super_admin() )
+ return;
+
+ // Don't do anything if a BP upgrade is in progress, or if the bp-wizard is in progress.
+ if ( defined( 'BP_IS_UPGRADE' ) && BP_IS_UPGRADE || empty( $submenu['bp-general-settings'] ) )
+ return;
+
+ /**
+ * By default, only the core "Help" submenu is added under the top-level BuddyPress menu.
+ * This means that if no third-party plugins have registered their admin pages into the
+ * 'bp-general-settings' menu, it will only contain one item. Kill it.
+ */
+ if ( 1 == count( $submenu['bp-general-settings'] ) ) {
+ // This removes the top-level menu
+ remove_submenu_page( 'bp-general-settings', 'bp-general-settings' );
+ remove_menu_page( 'bp-general-settings' );
+
+ // These stop people accessing the URL directly
+ unset( $_parent_pages['bp-general-settings'] );
+ unset( $_registered_pages['toplevel_page_bp-general-settings'] );
+ }
+}
+add_action( bp_core_admin_hook(), 'bp_core_admin_backpat_menu', 999 );
+
+/**
+ * Registers BuddyPress' admin menus.
+ *
+ * @since 1.0
+ */
</ins><span class="cx"> function bp_core_add_admin_menu() {
</span><del>- if ( !bp_current_user_can( 'bp_moderate' ) )
- return false;
</del><ins>+ if ( ! bp_current_user_can( 'bp_moderate' ) )
+ return;
</ins><span class="cx">
</span><del>- // Don't add this version of the admin menu if a BP upgrade is in progress
- // See bp_core_update_add_admin_menu()
</del><ins>+ /**
+ * Don't add this version of the admin menu if a BP upgrade is in progress.
+ * See bp_core_update_add_admin_menu().
+ */
</ins><span class="cx"> if ( defined( 'BP_IS_UPGRADE' ) && BP_IS_UPGRADE )
</span><del>- return false;
</del><ins>+ return;
</ins><span class="cx">
</span><span class="cx"> $hooks = array();
</span><span class="cx">
</span><del>- // Add the administration tab under the "Site Admin" tab for site administrators
- $hooks[] = add_menu_page( __( 'BuddyPress', 'buddypress' ), __( 'BuddyPress', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_component_setup', '' );
- $hooks[] = add_submenu_page( 'bp-general-settings', __( 'Components', 'buddypress' ), __( 'Components', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_component_setup' );
- $hooks[] = add_submenu_page( 'bp-general-settings', __( 'Pages', 'buddypress' ), __( 'Pages', 'buddypress' ), 'manage_options', 'bp-page-settings', 'bp_core_admin_page_setup' );
- $hooks[] = add_submenu_page( 'bp-general-settings', __( 'Settings', 'buddypress' ), __( 'Settings', 'buddypress' ), 'manage_options', 'bp-settings', 'bp_core_admin_settings' );
</del><ins>+ // Changed in BP 1.6 . See bp_core_admin_backpat_menu()
+ $hooks[] = add_menu_page( __( 'BuddyPress', 'buddypress' ), __( 'BuddyPress', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_backpat_menu', '' );
+ $hooks[] = add_submenu_page( 'bp-general-settings', __( 'BuddyPress Help', 'buddypress' ), __( 'Help', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_backpat_page' );
</ins><span class="cx">
</span><del>- // Add a hook for css/js
- foreach( $hooks as $hook )
</del><ins>+ // Add the option pages
+ $hooks[] = add_options_page( __( 'BuddyPress Components', 'buddypress' ), __( 'BuddyPress', 'buddypress' ), 'manage_options', 'bp-general-config', 'bp_core_admin_component_setup' );
+ $hooks[] = add_options_page( __( 'BuddyPress Pages', 'buddypress' ), __( 'BuddyPress Pages', 'buddypress' ), 'manage_options', 'bp-page-settings', 'bp_core_admin_page_setup' );
+ $hooks[] = add_options_page( __( 'BuddyPress Settings', 'buddypress' ), __( 'BuddyPress Settings', 'buddypress' ), 'manage_options', 'bp-settings', 'bp_core_admin_settings' );
+
+ foreach( $hooks as $hook ) {
+ // Add a hook for common BP admin CSS/JS scripts
</ins><span class="cx"> add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' );
</span><ins>+
+ // Fudge the highlighted subnav item when on a BuddyPress admin page
+ add_action( "admin_head-$hook", 'bp_core_modify_admin_menu_highlight' );
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Tweak the Settings subnav menu to show only one BuddyPress menu item (Settings > BuddyPress).
+ *
+ * @since 1.6
+ */
+function bp_core_modify_admin_menu() {
+ remove_submenu_page( 'options-general.php', 'bb-forums-setup' );
+ remove_submenu_page( 'options-general.php', 'bp-page-settings' );
+ remove_submenu_page( 'options-general.php', 'bp-settings' );
+}
+add_action( "admin_head", 'bp_core_modify_admin_menu', 999 );
+
+/**
+ * This tells WP to highlight the Settings > BuddyPress menu item,
+ * regardless of which actual BuddyPress admin screen we are on.
+ *
+ * The conditional prevents the behaviour when the user is viewing the
+ * backpat "Help" page, the Activity page, or any third-party plugins.
+ *
+ * @global string $plugin_page
+ * @global array $submenu
+ * @since 1.6
+ */
+function bp_core_modify_admin_menu_highlight() {
+ global $plugin_page, $submenu_file;
+
+ // This tweaks the Settings subnav menu to show only one BuddyPress menu item
+ if ( ! in_array( $plugin_page, array( 'bp-activity', 'bp-general-settings', ) ) )
+ $submenu_file = 'bp-general-config';
+}
+
+/**
</ins><span class="cx"> * Print admin messages to admin_notices or network_admin_notices
</span><span class="cx"> *
</span><span class="cx"> * BuddyPress combines all its messages into a single notice, to avoid a preponderance of yellow
</span></span></pre></div>
<a id="trunkbpforumsbpforumsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-admin.php (5405 => 5406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-admin.php 2011-11-28 15:50:02 UTC (rev 5405)
+++ trunk/bp-forums/bp-forums-admin.php 2011-11-28 22:30:03 UTC (rev 5406)
</span><span class="lines">@@ -5,12 +5,17 @@
</span><span class="cx"> function bp_forums_add_admin_menu() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( !bp_current_user_can( 'bp_moderate' ) )
- return false;
</del><ins>+ if ( ! bp_current_user_can( 'bp_moderate' ) )
+ return;
</ins><span class="cx">
</span><del>- // Add the administration tab under the "Site Admin" tab for site administrators
- $hook = add_submenu_page( 'bp-general-settings', __( 'Forums', 'buddypress' ), __( 'Forums', 'buddypress' ), 'manage_options', 'bb-forums-setup', "bp_forums_bbpress_admin" );
</del><ins>+ // Add the option pages
+ $hook = add_options_page( __( 'BuddyPress Forums', 'buddypress' ), __( 'BuddyPress Forums', 'buddypress' ), 'manage_options', 'bb-forums-setup', 'bp_forums_bbpress_admin' );
+
+ // Add a hook for common BP admin CSS/JS scripts
</ins><span class="cx"> add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' );
</span><ins>+
+ // Fudge the highlighted subnav item when on a BuddyPress admin page
+ add_action( "admin_head-$hook", 'bp_core_modify_admin_menu_highlight' );
</ins><span class="cx"> }
</span><span class="cx"> add_action( bp_core_admin_hook(), 'bp_forums_add_admin_menu' );
</span><span class="cx">
</span><span class="lines">@@ -360,4 +365,4 @@
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><ins>+?>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-admin.php (5405 => 5406)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-admin.php 2011-11-28 15:50:02 UTC (rev 5405)
+++ trunk/bp-xprofile/bp-xprofile-admin.php 2011-11-28 22:30:03 UTC (rev 5406)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> if ( !bp_current_user_can( 'bp_moderate' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $hook = add_submenu_page( 'bp-general-settings', __( 'Profile Fields', 'buddypress' ), __( 'Profile Fields', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
</del><ins>+ $hook = add_users_page( __( 'Profile Fields', 'buddypress' ), __( 'Profile Fields', 'buddypress' ), 'manage_options', 'bp-profile-setup', 'xprofile_admin' );
</ins><span class="cx">
</span><span class="cx"> add_action( "admin_print_styles-$hook", 'bp_core_add_admin_menu_styles' );
</span><span class="cx"> }
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> <h2>
</span><span class="cx">
</span><del>- <?php _e( 'Extended Profile Fields', 'buddypress'); ?>
</del><ins>+ <?php _e( 'Profile Fields', 'buddypress'); ?>
</ins><span class="cx">
</span><span class="cx"> <a id="add_group" class="button add-new-h2" href="admin.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Group', 'buddypress' ); ?></a>
</span><span class="cx"> </h2>
</span></span></pre>
</div>
</div>
</body>
</html>