Skip to:
Content

BuddyPress.org

Changeset 5575


Ignore:
Timestamp:
12/20/2011 03:43:16 PM (12 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:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-core/admin/bp-core-functions.php

    r5574 r5575  
    7272
    7373    remove_submenu_page( $page, 'bb-forums-setup' );
    74     remove_submenu_page( $page, 'bp-slugs'        );
     74    remove_submenu_page( $page, 'bp-page-settings' );
    7575    remove_submenu_page( $page, 'bp-settings'     );
    7676}
     
    286286
    287287    if ( !empty( $orphaned_components ) ) {
    288         $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-slugs' ), 'admin.php' ) );
     288        $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), 'admin.php' ) );
    289289        $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>' );
    290290
     
    311311    // If there are duplicates, post a message about them
    312312    if ( !empty( $dupe_names ) ) {
    313         $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-slugs' ), 'admin.php' ) );
     313        $admin_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings' ), 'admin.php' ) );
    314314        $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>' );
    315315
     
    352352        /* Settings Icon */
    353353        ul#adminmenu li.toplevel_page_bp-components .wp-menu-image a img,
    354         ul#adminmenu li.toplevel_page_bp-settings .wp-menu-image a img {
     354        ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img {
    355355            display: none;
    356356        }
    357357
    358358        ul#adminmenu li.toplevel_page_bp-components .wp-menu-image a,
    359         ul#adminmenu li.toplevel_page_bp-settings .wp-menu-image a {
     359        ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a {
    360360            background-image: url( <?php echo plugins_url( 'buddypress/bp-core/images/admin_menu_icon.png' ) ?> ) !important; background-position: -1px -32px;
    361361        }
    362362
    363363        ul#adminmenu li.toplevel_page_bp-components:hover .wp-menu-image a,
    364         ul#adminmenu li.toplevel_page_bp-settings:hover .wp-menu-image a,
     364        ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a,
    365365        ul#adminmenu li.toplevel_page_bp-components.wp-has-current-submenu .wp-menu-image a,
    366         ul#adminmenu li.toplevel_page_bp-settings.wp-has-current-submenu .wp-menu-image a {
     366        ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image a {
    367367            background-position: -1px 0;
    368368        }
     
    417417        ),
    418418        '1' => array(
    419             'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-slugs'      ), 'admin.php' ) ),
     419            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings'      ), 'admin.php' ) ),
    420420            'name' => __( 'Permalinks', 'buddypress' )
    421421        ),
     
    429429    if ( bp_is_active( 'forums' ) ) {
    430430        $tabs['3'] = array(
    431             'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bp-forums'    ), 'admin.php' ) ),
     431            'href' => bp_get_admin_url( add_query_arg( array( 'page' => 'bb-forums-setup' ), 'admin.php' ) ),
    432432            'name' => __( 'Forums', 'buddypress' )
    433433        );
  • trunk/bp-core/admin/bp-core-slugs.php

    r5524 r5575  
    207207        }
    208208
    209         $base_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-slugs', 'updated' => 'true' ), 'admin.php' ) );
     209        $base_url = bp_get_admin_url( add_query_arg( array( 'page' => 'bp-page-settings', 'updated' => 'true' ), 'admin.php' ) );
    210210
    211211        wp_redirect( $base_url );
  • trunk/bp-core/admin/bp-core-update.php

    r5524 r5575  
    193193
    194194                $step_count  = count( $this->steps ) - 1;
    195                 $wiz_or_set  = $this->current_step >= $step_count ? 'bp-general-config' : 'bp-wizard';
     195                $wiz_or_set  = $this->current_step >= $step_count ? 'bp-components' : 'bp-wizard';
    196196                $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' ) );
    197197            ?>
     
    11611161
    11621162            // Redirect to the BuddyPress dashboard
    1163             $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' ) );
     1163            $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' ) );
    11641164
    11651165            wp_redirect( $redirect );
  • trunk/bp-core/bp-core-admin.php

    r5557 r5575  
    216216            __( 'BuddyPress Pages', 'buddypress' ),
    217217            'manage_options',
    218             'bp-slugs',
     218            'bp-page-settings',
    219219            'bp_core_admin_slugs_settings'
    220220        );
Note: See TracChangeset for help on using the changeset viewer.