Changeset 5575

Timestamp:

12/20/2011 03:43:16 PM (13 years ago)

Author:

djpaul

Message:

Fix forum settings link in admin, and revert other admin slugs back to their 1.5 names. See #3840

Location:

trunk/bp-core

Files:

• admin/bp-core-functions.php (modified) (6 diffs)
• admin/bp-core-slugs.php (modified) (1 diff)
• admin/bp-core-update.php (modified) (2 diffs)
• bp-core-admin.php (modified) (1 diff)

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

@@ -72 +72 @@
 
     remove_submenu_page( $page, 'bb-forums-setup' );
-    remove_submenu_page( $page, 'bp-slugs'        );
+    remove_submenu_page( $page, 'bp-page-settings' );
     remove_submenu_page( $page, 'bp-settings'     );
 }
@@ -286 +286 @@
 
     if ( !empty( $orphaned_components ) ) {
-        $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-slugs' ), 'admin.php' ) );
+        $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), 'admin.php' ) );
         $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>' );
 
@@ -311 +311 @@
     // If there are duplicates, post a message about them
     if ( !empty( $dupe_names ) ) {
-        $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-slugs' ), 'admin.php' ) );
+        $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), 'admin.php' ) );
         $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>' );
 
@@ -352 +352 @@
         /* Settings Icon */
         ul#adminmenu li.toplevel_page_bp-components .wp-menu-image a img,
-        ul#adminmenu li.toplevel_page_bp-settings .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-components .wp-menu-image a,
-        ul#adminmenu li.toplevel_page_bp-settings .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-components:hover .wp-menu-image a,
-        ul#adminmenu li.toplevel_page_bp-settings:hover .wp-menu-image a,
+        ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a,
         ul#adminmenu li.toplevel_page_bp-components.wp-has-current-submenu .wp-menu-image a,
-        ul#adminmenu li.toplevel_page_bp-settings.wp-has-current-submenu .wp-menu-image a {
+        ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image a {
             background-position: -1px 0;
         }
@@ -417 +417 @@
         ),
         '1' => array(
-            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-slugs'      ), 'admin.php' ) ),
+            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings'      ), 'admin.php' ) ),
             'name' => __( 'Permalinks', 'buddypress' )
         ),
@@ -429 +429 @@
     if ( bp_is_active( 'forums' ) ) {
         $tabs['3'] = array(
-            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-forums'     ), 'admin.php' ) ),
+            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bb-forums-setup' ), 'admin.php' ) ),
             'name' => __( 'Forums', 'buddypress' )
         );

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

@@ -207 +207 @@
         }
 
-        $base_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-slugs', 'updated' => 'true' ), 'admin.php' ) );
+        $base_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings', 'updated' => 'true' ), 'admin.php' ) );
 
         wp_redirect( $base_url );

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

@@ -193 +193 @@
 
                 $step_count  = count( $this->steps ) - 1;
-                $wiz_or_set  = $this->current_step >= $step_count ? 'bp-general-config' : 'bp-wizard';
+                $wiz_or_set  = $this->current_step >= $step_count ? 'bp-components' : 'bp-wizard';
                 $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' ) );
             ?>
@@ -1161 +1161 @@
 
             // Redirect to the BuddyPress dashboard
-            $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' ) );
+            $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' ) );
 
             wp_redirect( $redirect );

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

@@ -216 +216 @@
             __( 'BuddyPress Pages', 'buddypress' ),
             'manage_options',
-            'bp-slugs',
+            'bp-page-settings',
             'bp_core_admin_slugs_settings'
         );