<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [1960] trunk: Updated admin menu/submenu syntax.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>1960</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-09-26 07:28:06 +0000 (Sat, 26 Sep 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Updated admin menu/submenu syntax. Props markjaquith.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecssjsphp">trunk/bp-core/bp-core-cssjs.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
<li><a href="#trunkbpforumsbpforumsadminphp">trunk/bp-forums/bp-forums-admin.php</a></li>
<li><a href="#trunkbpforumsphp">trunk/bp-forums.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileadminphp">trunk/bp-xprofile/bp-xprofile-admin.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileclassesphp">trunk/bp-xprofile/bp-xprofile-classes.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilecssjsphp">trunk/bp-xprofile/bp-xprofile-cssjs.php</a></li>
<li><a href="#trunkbpxprofilephp">trunk/bp-xprofile.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorecssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-cssjs.php (1959 => 1960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-cssjs.php        2009-09-25 22:26:21 UTC (rev 1959)
+++ trunk/bp-core/bp-core-cssjs.php        2009-09-26 07:28:06 UTC (rev 1960)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> function bp_core_add_admin_bar_css() {
</span><span class="cx">         global $current_blog;
</span><span class="cx">         
</span><del>-        if ( defined( 'BP_DISABLE_ADMIN_BAR') )
</del><ins>+        if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
</ins><span class="cx">                 return false;
</span><span class="cx">         
</span><span class="cx">         if ( BP_ROOT_BLOG == $current_blog-&gt;blog_id &amp;&amp; !is_admin() )
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (1959 => 1960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php        2009-09-25 22:26:21 UTC (rev 1959)
+++ trunk/bp-core.php        2009-09-26 07:28:06 UTC (rev 1960)
</span><span class="lines">@@ -283,13 +283,13 @@
</span><span class="cx">         bp_core_add_admin_menu_page( array(
</span><span class="cx">                 'menu_title' =&gt; __( 'BuddyPress', 'buddypress' ),
</span><span class="cx">                 'page_title' =&gt; __( 'BuddyPress', 'buddypress' ),
</span><del>-                'access_level' =&gt; 10, 'file' =&gt; 'bp-core.php',
</del><ins>+                'access_level' =&gt; 10, 'file' =&gt; 'bp-general-settings',
</ins><span class="cx">                 'function' =&gt; 'bp_core_admin_settings',
</span><span class="cx">                 'position' =&gt; 2
</span><span class="cx">         ) );
</span><span class="cx">         
</span><del>-        add_submenu_page( 'bp-core.php', __( 'General Settings', 'buddypress'), __( 'General Settings', 'buddypress' ), 1, 'bp-core.php', 'bp_core_admin_settings' );
-        add_submenu_page( 'bp-core.php', __( 'Component Setup', 'buddypress'), __( 'Component Setup', 'buddypress' ), 2, __FILE__, 'bp_core_admin_component_setup' );
</del><ins>+        add_submenu_page( 'bp-general-settings', __( 'General Settings', 'buddypress'), __( 'General Settings', 'buddypress' ), 'manage_options', 'bp-general-settings', 'bp_core_admin_settings' );
+        add_submenu_page( 'bp-general-settings', __( 'Component Setup', 'buddypress'), __( 'Component Setup', 'buddypress' ), 'manage_options', 'bp-component-setup', 'bp_core_admin_component_setup' );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'bp_core_add_admin_menu' );
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkbpforumsbpforumsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-admin.php (1959 => 1960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-admin.php        2009-09-25 22:26:21 UTC (rev 1959)
+++ trunk/bp-forums/bp-forums-admin.php        2009-09-26 07:28:06 UTC (rev 1960)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx">                         update_site_option( 'bb-config-location', false );
</span><span class="cx">                         bp_forums_bbpress_install_wizard();
</span><span class="cx">                 } else { ?&gt;
</span><del>-                        &lt;p&gt;&lt;?php printf( __( 'bbPress forum integration in BuddyPress has been set up correctly. If you are having problems you can &lt;a href=&quot;%s&quot; title=&quot;Reinstall bbPress&quot;&gt;re-install&lt;/a&gt;', 'buddypress' ), site_url( 'wp-admin/admin.php?page=buddypress/bp-forums.php&amp;reinstall=1' ) ); ?&gt;
</del><ins>+                        &lt;p&gt;&lt;?php printf( __( 'bbPress forum integration in BuddyPress has been set up correctly. If you are having problems you can &lt;a href=&quot;%s&quot; title=&quot;Reinstall bbPress&quot;&gt;re-install&lt;/a&gt;', 'buddypress' ), site_url( 'wp-admin/admin.php?page=bb-forums-setup&amp;reinstall=1' ) ); ?&gt;
</ins><span class="cx">                         &lt;p&gt;&lt;?php _e( 'NOTE: The forums directory will only work if your bbPress tables are in the same database as your WordPress tables. If you are not using an existing bbPress install you can ignore this message.', 'buddypress' ) ?&gt;&lt;/p&gt;
</span><span class="cx">                 &lt;?php        
</span><span class="cx">                 }
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function bp_forums_bbpress_install_wizard() { 
</span><del>-        $post_url = site_url( 'wp-admin/admin.php?page=' . 'buddypress/bp-forums.php' );
</del><ins>+        $post_url = site_url( 'wp-admin/admin.php?page=bb-forums-setup' );
</ins><span class="cx"> 
</span><span class="cx">         switch( $_REQUEST['step'] ) {                 
</span><span class="cx">                 case 'existing':
</span></span></pre></div>
<a id="trunkbpforumsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums.php (1959 => 1960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums.php        2009-09-25 22:26:21 UTC (rev 1959)
+++ trunk/bp-forums.php        2009-09-26 07:28:06 UTC (rev 1960)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx">         require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-admin.php' );
</span><span class="cx">         
</span><span class="cx">         /* Add the administration tab under the &quot;Site Admin&quot; tab for site administrators */
</span><del>-        add_submenu_page( 'bp-core.php', __( 'Forums Setup', 'buddypress' ), __( 'Forums Setup', 'buddypress' ), 2, __FILE__, &quot;bp_forums_bbpress_admin&quot; );
</del><ins>+        add_submenu_page( 'bp-general-settings', __( 'Forums Setup', 'buddypress' ), __( 'Forums Setup', 'buddypress' ), 'manage_options', 'bb-forums-setup', &quot;bp_forums_bbpress_admin&quot; );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'bp_forums_add_admin_menu' );
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-admin.php (1959 => 1960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-admin.php        2009-09-25 22:26:21 UTC (rev 1959)
+++ trunk/bp-xprofile/bp-xprofile-admin.php        2009-09-26 07:28:06 UTC (rev 1960)
</span><span class="lines">@@ -65,8 +65,8 @@
</span><span class="cx">                                                                 &lt;th scope=&quot;col&quot;&gt;&amp;nbsp;&lt;/th&gt;
</span><span class="cx">                                                             &lt;th scope=&quot;col&quot; colspan=&quot;&lt;?php if ( $groups[$i]-&gt;can_delete ) { ?&gt;3&lt;?php } else { ?&gt;5&lt;?php } ?&gt;&quot;&gt;&lt;?php echo attribute_escape( $groups[$i]-&gt;name ); ?&gt;&lt;/th&gt;
</span><span class="cx">                                                                 &lt;?php if ( $groups[$i]-&gt;can_delete ) { ?&gt;            
</span><del>-                                                                        &lt;th scope=&quot;col&quot;&gt;&lt;a class=&quot;edit&quot; href=&quot;admin.php?page=&lt;?php echo BP_PLUGIN_DIR ?&gt;/bp-xprofile.php&amp;amp;mode=edit_group&amp;amp;group_id=&lt;?php echo attribute_escape( $groups[$i]-&gt;id ); ?&gt;&quot;&gt;&lt;?php _e( 'Edit', 'buddypress' ) ?&gt;&lt;/a&gt;&lt;/th&gt;
-                                                                    &lt;th scope=&quot;col&quot;&gt;&lt;a class=&quot;delete&quot; href=&quot;admin.php?page=&lt;?php echo BP_PLUGIN_DIR ?&gt;/bp-xprofile.php&amp;amp;mode=delete_group&amp;amp;group_id=&lt;?php echo attribute_escape( $groups[$i]-&gt;id ); ?&gt;&quot;&gt;&lt;?php _e( 'Delete', 'buddypress' ) ?&gt;&lt;/a&gt;&lt;/th&gt;
</del><ins>+                                                                        &lt;th scope=&quot;col&quot;&gt;&lt;a class=&quot;edit&quot; href=&quot;admin.php?page=bp-profile-setup&amp;amp;mode=edit_group&amp;amp;group_id=&lt;?php echo attribute_escape( $groups[$i]-&gt;id ); ?&gt;&quot;&gt;&lt;?php _e( 'Edit', 'buddypress' ) ?&gt;&lt;/a&gt;&lt;/th&gt;
+                                                                    &lt;th scope=&quot;col&quot;&gt;&lt;a class=&quot;delete&quot; href=&quot;admin.php?page=bp-profile-setup&amp;amp;mode=delete_group&amp;amp;group_id=&lt;?php echo attribute_escape( $groups[$i]-&gt;id ); ?&gt;&quot;&gt;&lt;?php _e( 'Delete', 'buddypress' ) ?&gt;&lt;/a&gt;&lt;/th&gt;
</ins><span class="cx">                                                                 &lt;?php } ?&gt;
</span><span class="cx">                                                         &lt;/tr&gt;
</span><span class="cx">                                                         &lt;tr class=&quot;header&quot;&gt;
</span><span class="lines">@@ -92,8 +92,8 @@
</span><span class="cx">                                                                                 &lt;td&gt;&lt;span title=&quot;&lt;?php echo $field-&gt;desc; ?&gt;&quot;&gt;&lt;?php echo attribute_escape( $field-&gt;name ); ?&gt; &lt;?php if(!$field-&gt;can_delete) { ?&gt;(Core)&lt;?php } ?&gt;&lt;/span&gt;&lt;/td&gt;
</span><span class="cx">                                                                             &lt;td&gt;&lt;?php echo attribute_escape( $field-&gt;type ); ?&gt;&lt;/td&gt;
</span><span class="cx">                                                                             &lt;td style=&quot;text-align:center;&quot;&gt;&lt;?php if ( $field-&gt;is_required ) { echo '&lt;img src=&quot;' . BP_PLUGIN_URL . '/bp-xprofile/admin/images/tick.gif&quot; alt=&quot;' . __( 'Yes', 'buddypress' ) . '&quot; /&gt;'; } else { ?&gt;--&lt;?php } ?&gt;&lt;/td&gt;
</span><del>-                                                                            &lt;td style=&quot;text-align:center;&quot;&gt;&lt;?php if ( !$field-&gt;can_delete ) { ?&gt;&lt;strike&gt;&lt;?php _e( 'Edit', 'buddypress' ) ?&gt;&lt;/strike&gt;&lt;?php } else { ?&gt;&lt;a class=&quot;edit&quot; href=&quot;admin.php?page=&lt;?php echo BP_PLUGIN_DIR ?&gt;/bp-xprofile.php&amp;amp;group_id=&lt;?php echo attribute_escape( $groups[$i]-&gt;id ); ?&gt;&amp;amp;field_id=&lt;?php echo attribute_escape( $field-&gt;id ); ?&gt;&amp;amp;mode=edit_field&quot;&gt;&lt;?php _e( 'Edit', 'buddypress' ) ?&gt;&lt;/a&gt;&lt;?php } ?&gt;&lt;/td&gt;
-                                                                            &lt;td style=&quot;text-align:center;&quot;&gt;&lt;?php if ( !$field-&gt;can_delete ) { ?&gt;&lt;strike&gt;&lt;?php _e( 'Delete', 'buddypress' ) ?&gt;&lt;/strike&gt;&lt;?php } else { ?&gt;&lt;a class=&quot;delete&quot; href=&quot;admin.php?page=&lt;?php echo BP_PLUGIN_DIR ?&gt;/bp-xprofile.php&amp;amp;field_id=&lt;?php echo attribute_escape( $field-&gt;id ); ?&gt;&amp;amp;mode=delete_field&quot;&gt;&lt;?php _e( 'Delete', 'buddypress' ) ?&gt;&lt;/a&gt;&lt;?php } ?&gt;&lt;/td&gt;
</del><ins>+                                                                            &lt;td style=&quot;text-align:center;&quot;&gt;&lt;?php if ( !$field-&gt;can_delete ) { ?&gt;&lt;strike&gt;&lt;?php _e( 'Edit', 'buddypress' ) ?&gt;&lt;/strike&gt;&lt;?php } else { ?&gt;&lt;a class=&quot;edit&quot; href=&quot;admin.php?page=bp-profile-setup&amp;amp;group_id=&lt;?php echo attribute_escape( $groups[$i]-&gt;id ); ?&gt;&amp;amp;field_id=&lt;?php echo attribute_escape( $field-&gt;id ); ?&gt;&amp;amp;mode=edit_field&quot;&gt;&lt;?php _e( 'Edit', 'buddypress' ) ?&gt;&lt;/a&gt;&lt;?php } ?&gt;&lt;/td&gt;
+                                                                            &lt;td style=&quot;text-align:center;&quot;&gt;&lt;?php if ( !$field-&gt;can_delete ) { ?&gt;&lt;strike&gt;&lt;?php _e( 'Delete', 'buddypress' ) ?&gt;&lt;/strike&gt;&lt;?php } else { ?&gt;&lt;a class=&quot;delete&quot; href=&quot;admin.php?page=bp-profile-setup&amp;amp;field_id=&lt;?php echo attribute_escape( $field-&gt;id ); ?&gt;&amp;amp;mode=delete_field&quot;&gt;&lt;?php _e( 'Delete', 'buddypress' ) ?&gt;&lt;/a&gt;&lt;?php } ?&gt;&lt;/td&gt;
</ins><span class="cx">                                                                     &lt;/tr&gt;
</span><span class="cx">                                                         
</span><span class="cx">                                                                 &lt;?php } ?&gt;
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">                                                 &lt;tfoot&gt;
</span><span class="cx">                                                 
</span><span class="cx">                                                                 &lt;tr class=&quot;nodrag&quot;&gt;
</span><del>-                                                                        &lt;td colspan=&quot;6&quot;&gt;&lt;a href=&quot;admin.php?page=&lt;?php echo BP_PLUGIN_DIR ?&gt;/bp-xprofile.php&amp;amp;group_id=&lt;?php echo attribute_escape( $groups[$i]-&gt;id ); ?&gt;&amp;amp;mode=add_field&quot;&gt;&lt;?php _e( 'Add New Field', 'buddypress' ) ?&gt;&lt;/a&gt;&lt;/td&gt;
</del><ins>+                                                                        &lt;td colspan=&quot;6&quot;&gt;&lt;a href=&quot;admin.php?page=bp-profile-setup&amp;amp;group_id=&lt;?php echo attribute_escape( $groups[$i]-&gt;id ); ?&gt;&amp;amp;mode=add_field&quot;&gt;&lt;?php _e( 'Add New Field', 'buddypress' ) ?&gt;&lt;/a&gt;&lt;/td&gt;
</ins><span class="cx">                                                                 &lt;/tr&gt;
</span><span class="cx">                                                 
</span><span class="cx">                                                 &lt;/tfoot&gt;
</span><span class="lines">@@ -122,12 +122,12 @@
</span><span class="cx">                                 &lt;?php } /* End For */ ?&gt;
</span><span class="cx">                         
</span><span class="cx">                                         &lt;p&gt;
</span><del>-                                                &lt;a class=&quot;button&quot; href=&quot;admin.php?page=&lt;?php echo BP_PLUGIN_DIR ?&gt;/bp-xprofile.php&amp;amp;mode=add_group&quot;&gt;&lt;?php _e( 'Add New Field Group', 'buddypress' ) ?&gt;&lt;/a&gt;
</del><ins>+                                                &lt;a class=&quot;button&quot; href=&quot;admin.php?page=bp-profile-setup&amp;amp;mode=add_group&quot;&gt;&lt;?php _e( 'Add New Field Group', 'buddypress' ) ?&gt;&lt;/a&gt;
</ins><span class="cx">                                         &lt;/p&gt;
</span><span class="cx">                                 
</span><span class="cx">                         &lt;?php } else { ?&gt;
</span><span class="cx">                                 &lt;div id=&quot;message&quot; class=&quot;error&quot;&gt;&lt;p&gt;&lt;?php _e('You have no groups.', 'buddypress' ); ?&gt;&lt;/p&gt;&lt;/div&gt;
</span><del>-                                &lt;p&gt;&lt;a href=&quot;admin.php?page=&lt;?php echo BP_PLUGIN_DIR ?&gt;/bp-xprofile.php&amp;amp;mode=add_group&quot;&gt;&lt;?php _e( 'Add New Group', 'buddypress' ) ?&gt;&lt;/a&gt;&lt;/p&gt;
</del><ins>+                                &lt;p&gt;&lt;a href=&quot;admin.php?page=bp-profile-setup&amp;amp;mode=add_group&quot;&gt;&lt;?php _e( 'Add New Group', 'buddypress' ) ?&gt;&lt;/a&gt;&lt;/p&gt;
</ins><span class="cx">                         &lt;?php } ?&gt;
</span><span class="cx">                 
</span><span class="cx">                 &lt;/form&gt;
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-classes.php (1959 => 1960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-classes.php        2009-09-25 22:26:21 UTC (rev 1959)
+++ trunk/bp-xprofile/bp-xprofile-classes.php        2009-09-26 07:28:06 UTC (rev 1960)
</span><span class="lines">@@ -134,10 +134,10 @@
</span><span class="cx"> 
</span><span class="cx">                 if ( !$this-&gt;id ) {
</span><span class="cx">                         $title = __('Add New Field Group', 'buddypress');
</span><del>-                        $action = &quot;admin.php?page=&quot; . BP_PLUGIN_DIR . &quot;/bp-xprofile.php&amp;amp;mode=add_group&quot;;
</del><ins>+                        $action = &quot;admin.php?page=bp-profile-setup&amp;amp;mode=add_group&quot;;
</ins><span class="cx">                 } else {
</span><span class="cx">                         $title = __('Edit Field Group', 'buddypress');
</span><del>-                        $action = &quot;admin.php?page=&quot; . BP_PLUGIN_DIR . &quot;/bp-xprofile.php&amp;amp;mode=edit_group&amp;amp;group_id=&quot; . $this-&gt;id;                        
</del><ins>+                        $action = &quot;admin.php?page=bp-profile-setup&amp;amp;mode=edit_group&amp;amp;group_id=&quot; . $this-&gt;id;                        
</ins><span class="cx">                 }
</span><span class="cx">         ?&gt;
</span><span class="cx">                 &lt;div class=&quot;wrap&quot;&gt;
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx">                                                    &lt;input type=&quot;text&quot; name=&quot;&lt;?php echo $type ?&gt;_option[&lt;?php echo $j ?&gt;]&quot; id=&quot;&lt;?php echo $type ?&gt;_option&lt;?php echo $j ?&gt;&quot; value=&quot;&lt;?php echo attribute_escape( $options[$i]-&gt;name ) ?&gt;&quot; /&gt;
</span><span class="cx">                                                    &lt;input type=&quot;&lt;?php echo $default_input ?&gt;&quot; name=&quot;isDefault_&lt;?php echo $type ?&gt;_option&lt;?php echo $default_name ?&gt;&quot; &lt;?php if ( (int) $options[$i]-&gt;is_default_option ) {?&gt; checked=&quot;checked&quot;&lt;?php } ?&gt; &quot; value=&quot;&lt;?php echo $j ?&gt;&quot; /&gt; &lt;?php _e( 'Default Value', 'buddypress' ) ?&gt; 
</span><span class="cx">                                                         &lt;?php if ( $j != 1 &amp;&amp;
</span><del>-                                                                $options[$i]-&gt;id != -1 ) : ?&gt;&lt;a href=&quot;admin.php?page=&lt;?php echo BP_PLUGIN_DIR ?&gt;/bp-xprofile.php&amp;amp;mode=delete_option&amp;amp;option_id=&lt;?php echo $options[$i]-&gt;id ?&gt;&quot; class=&quot;ajax-option-delete&quot; id=&quot;delete-&lt;?php echo $options[$i]-&gt;id ?&gt;&quot;&gt;[x]&lt;/a&gt;&lt;?php endif ?&gt;&lt;/p&gt;
</del><ins>+                                                                $options[$i]-&gt;id != -1 ) : ?&gt;&lt;a href=&quot;admin.php?page=bp-profile-setup&amp;amp;mode=delete_option&amp;amp;option_id=&lt;?php echo $options[$i]-&gt;id ?&gt;&quot; class=&quot;ajax-option-delete&quot; id=&quot;delete-&lt;?php echo $options[$i]-&gt;id ?&gt;&quot;&gt;[x]&lt;/a&gt;&lt;?php endif ?&gt;&lt;/p&gt;
</ins><span class="cx">                                                 &lt;/p&gt;
</span><span class="cx">                                         &lt;?php } // end for ?&gt;
</span><span class="cx">                                         &lt;input type=&quot;hidden&quot; name=&quot;&lt;?php echo $type ?&gt;_option_number&quot; id=&quot;&lt;?php echo $type ?&gt;_option_number&quot; value=&quot;&lt;?php echo $j + 1 ?&gt;&quot; /&gt;
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx">         function render_admin_form( $message = '' ) {
</span><span class="cx">                 if ( !$this-&gt;id ) {
</span><span class="cx">                         $title = __('Add Field', 'buddypress');
</span><del>-                        $action = &quot;admin.php?page=&quot; . BP_PLUGIN_DIR . &quot;/bp-xprofile.php&amp;amp;group_id=&quot; . $this-&gt;group_id . &quot;&amp;amp;mode=add_field&quot;;
</del><ins>+                        $action = &quot;admin.php?page=bp-profile-setup&amp;amp;group_id=&quot; . $this-&gt;group_id . &quot;&amp;amp;mode=add_field&quot;;
</ins><span class="cx"> 
</span><span class="cx">                         $this-&gt;name                        = $_POST['title'];
</span><span class="cx">                         $this-&gt;desc                        = $_POST['description'];
</span><span class="lines">@@ -525,7 +525,7 @@
</span><span class="cx">                         $this-&gt;order_by                = $_POST[&quot;sort_order_{$this-&gt;type}&quot;];
</span><span class="cx">                 } else {
</span><span class="cx">                         $title = __('Edit Field', 'buddypress');
</span><del>-                        $action = &quot;admin.php?page=&quot; . BP_PLUGIN_DIR . &quot;/bp-xprofile.php&amp;amp;mode=edit_field&amp;amp;group_id=&quot; . $this-&gt;group_id . &quot;&amp;amp;field_id=&quot; . $this-&gt;id;                        
</del><ins>+                        $action = &quot;admin.php?page=bp-profile-setup&amp;amp;mode=edit_field&amp;amp;group_id=&quot; . $this-&gt;group_id . &quot;&amp;amp;field_id=&quot; . $this-&gt;id;                        
</ins><span class="cx">                 }
</span><span class="cx">         ?&gt;
</span><span class="cx">         
</span><span class="lines">@@ -583,7 +583,7 @@
</span><span class="cx">         
</span><span class="cx">                                 &lt;p class=&quot;submit&quot;&gt;
</span><span class="cx">                                                 &amp;nbsp;&lt;input type=&quot;submit&quot; value=&quot;&lt;?php _e(&quot;Save&quot;, 'buddypress') ?&gt; &amp;raquo;&quot; name=&quot;saveField&quot; id=&quot;saveField&quot; style=&quot;font-weight: bold&quot; /&gt;
</span><del>-                                                 &lt;?php _e('or', 'buddypress') ?&gt; &lt;a href=&quot;admin.php?page=&lt;?php echo BP_PLUGIN_DIR ?&gt;/bp-xprofile.php&quot; style=&quot;color: red&quot;&gt;&lt;?php _e( 'Cancel', 'buddypress' ) ?&gt;&lt;/a&gt;
</del><ins>+                                                 &lt;?php _e('or', 'buddypress') ?&gt; &lt;a href=&quot;admin.php?page=bp-profile-setup&quot; style=&quot;color: red&quot;&gt;&lt;?php _e( 'Cancel', 'buddypress' ) ?&gt;&lt;/a&gt;
</ins><span class="cx">                                 &lt;/p&gt;
</span><span class="cx">                         
</span><span class="cx">                         &lt;div class=&quot;clear&quot;&gt;&lt;/div&gt;
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilecssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-cssjs.php (1959 => 1960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-cssjs.php        2009-09-25 22:26:21 UTC (rev 1959)
+++ trunk/bp-xprofile/bp-xprofile-cssjs.php        2009-09-26 07:28:06 UTC (rev 1960)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> add_action( 'admin_menu', 'xprofile_add_admin_css' );
</span><span class="cx"> 
</span><span class="cx"> function xprofile_add_admin_js() {
</span><del>-        if ( strpos( $_GET['page'], 'xprofile' ) !== false ) {
</del><ins>+        if ( strpos( $_GET['page'], 'bp-profile-setup' ) !== false ) {
</ins><span class="cx">                 wp_enqueue_script( array( &quot;jquery-ui-sortable&quot; ) );
</span><span class="cx">                 wp_enqueue_script( 'xprofile-admin-js', BP_PLUGIN_URL . '/bp-xprofile/admin/js/admin.js', array( 'jquery' ) );
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkbpxprofilephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile.php (1959 => 1960)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile.php        2009-09-25 22:26:21 UTC (rev 1959)
+++ trunk/bp-xprofile.php        2009-09-26 07:28:06 UTC (rev 1960)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx">                 return false;
</span><span class="cx">                         
</span><span class="cx">         /* Add the administration tab under the &quot;Site Admin&quot; tab for site administrators */
</span><del>-        add_submenu_page( 'bp-core.php', __(&quot;Profile Field Setup&quot;, 'buddypress'), __(&quot;Profile Field Setup&quot;, 'buddypress'), 1, __FILE__, &quot;xprofile_admin&quot; );
</del><ins>+        add_submenu_page( 'bp-general-settings', __(&quot;Profile Field Setup&quot;, 'buddypress'), __(&quot;Profile Field Setup&quot;, 'buddypress'), 'manage-options', 'bp-profile-setup', &quot;xprofile_admin&quot; );
</ins><span class="cx"> 
</span><span class="cx">         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
</span><span class="cx">         if ( get_site_option('bp-xprofile-db-version') &lt; BP_XPROFILE_DB_VERSION )
</span></span></pre>
</div>
</div>

</body>
</html>