Skip to:
Content

BuddyPress.org

Changeset 4293


Ignore:
Timestamp:
04/25/2011 10:25:17 AM (13 years ago)
Author:
djpaul
Message:

Revert r4292:4290. See #3178

File:
1 edited

Legend:

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

    r4292 r4293  
    6767            );
    6868
    69             // Only show permalinks panel if we don't already use them
    70             if ( !empty( $wp_rewrite->permalink_structure ) ) {
    71                 unset( $steps[2] );
    72 
    73                 // Reset the keys by merging with an empty array
    74                 $steps = array_merge( array(), $steps );
    75             }
    76 
    7769        // Update wizard steps
    7870        } else {
     
    271263        else
    272264            $blogs_slug = 'blogs';
    273 
    274         // Call up old bp-pages to see if a page has been previously linked to Blogs
     265 
     266        // Call up old bp-pages to see if a page has been previously linked to Blogs 
    275267        $page_blog_id       = is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ? get_current_blog_id() : BP_ROOT_BLOG;
    276268        $existing_pages_data    = get_blog_option( $page_blog_id, 'bp-pages' );
     
    782774                $existing_pages_data    = get_blog_option( $page_blog_id, 'bp-pages' );
    783775                $existing_pages     = $existing_pages_data[$page_blog_id];
    784 
     776               
    785777                $bp_pages           = $this->setup_pages( (array)$_POST['bp_pages'] );
    786778                $bp_pages           = array_merge( (array)$existing_pages, (array)$bp_pages );
    787 
     779               
    788780                $existing_pages_data[$page_blog_id] = $bp_pages;
    789781
     
    10151007            @setcookie( 'bp-wizard-step', '', time() - 3600, COOKIEPATH );
    10161008
    1017             // Load BP, so that the redirect is successful
     1009            // Load BP, so that the redirect is successful         
    10181010            require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-loader.php' );
    10191011
     
    10791071
    10801072    require_once( dirname( __FILE__ ) . '/bp-core-schema.php' );
    1081 
     1073   
    10821074    // Core DB Tables
    10831075    bp_core_install_notifications();
     
    12921284function bp_core_update_get_page_meta() {
    12931285    $page_ids = get_site_option( 'bp-pages' );
    1294 
     1286   
    12951287    $is_enable_multiblog = is_multisite() && defined( 'BP_ENABLE_MULTIBLOG' ) && BP_ENABLE_MULTIBLOG ? true : false;
    12961288
    12971289    $page_blog_id = $is_enable_multiblog ? get_current_blog_id() : BP_ROOT_BLOG;
    1298 
     1290   
    12991291    $blog_page_ids = !empty( $page_ids[$page_blog_id] ) ? $page_ids[$page_blog_id] : false;
    1300 
     1292   
    13011293    return apply_filters( 'bp_core_update_get_page_meta', $blog_page_ids );
    13021294}
Note: See TracChangeset for help on using the changeset viewer.