Skip to:
Content

BuddyPress.org

Changeset 3343


Ignore:
Timestamp:
11/03/2010 07:34:25 PM (11 years ago)
Author:
djpaul
Message:

Add https support to bp_core_get_root_domain(). Fixes #1948.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-core.php

    r3331 r3343  
    615615
    616616    if ( defined( 'BP_ENABLE_MULTIBLOG' ) )
    617         $domain = get_blog_option( $current_blog->blog_id, 'home' );
     617        $domain = get_home_url( $current_blog->blog_id );
    618618    else
    619         $domain = get_blog_option( BP_ROOT_BLOG, 'home' );
     619        $domain = get_home_url( BP_ROOT_BLOG );
    620620
    621621    return apply_filters( 'bp_core_get_root_domain', $domain );
  • trunk/bp-core/admin/bp-core-upgrade.php

    r3232 r3343  
    485485            <tr>
    486486                <th><label><input name="permalink_structure" type="radio"<?php if ( empty( $permalink_structure ) || false != strpos( $permalink_structure, $structures[1] ) ) : ?> checked="checked" <?php endif; ?>value="<?php echo esc_attr( $structures[1] ); ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> />&nbsp;<?php _e('Day and name'); ?></label></th>
    487                 <td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
     487                <td><code><?php echo get_home_url() . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
    488488            </tr>
    489489            <tr>
    490490                <th><label><input name="permalink_structure" type="radio"<?php if ( empty( $permalink_structure ) || false != strpos( $permalink_structure, $structures[2] ) ) : ?> checked="checked" <?php endif; ?> value="<?php echo esc_attr( $structures[2] ); ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> />&nbsp;<?php _e('Month and name'); ?></label></th>
    491                 <td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
     491                <td><code><?php echo get_home_url() . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
    492492            </tr>
    493493            <tr>
    494494                <th><label><input name="permalink_structure" type="radio"<?php if ( empty( $permalink_structure ) || false != strpos( $permalink_structure, $structures[3] ) ) : ?> checked="checked" <?php endif; ?> value="<?php echo esc_attr( $structures[3] ); ?>" class="tog" <?php checked($structures[3], $permalink_structure); ?> />&nbsp;<?php _e('Numeric'); ?></label></th>
    495                 <td><code><?php echo get_option('home') . $prefix ?>/archives/123</code></td>
     495                <td><code><?php echo get_home_url() . $prefix ?>/archives/123</code></td>
    496496            </tr>
    497497        </table>
  • trunk/bp-core/bp-core-avatars.php

    r3300 r3343  
    568568    // If multisite, and current blog does not match root blog, make adjustments
    569569    if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
    570         $upload_dir['baseurl'] = str_replace( get_blog_option( $current_blog->blog_id, 'home' ) , get_blog_option( BP_ROOT_BLOG, 'home' ), $upload_dir['baseurl'] );
     570        $upload_dir['baseurl'] = str_replace( get_home_url( $current_blog->blog_id ) , get_home_url( BP_ROOT_BLOG ), $upload_dir['baseurl'] );
    571571
    572572    return apply_filters( 'bp_core_avatar_url', $upload_dir['baseurl'] );
Note: See TracChangeset for help on using the changeset viewer.