Changeset 3343

Timestamp:

11/03/2010 07:34:25 PM (14 years ago)

Author:

djpaul

Message:

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

Location:

trunk

Files:

• bp-core.php (modified) (1 diff)
• bp-core/admin/bp-core-upgrade.php (modified) (1 diff)
• bp-core/bp-core-avatars.php (modified) (1 diff)

trunk/bp-core.php

@@ -615 +615 @@
 
     if ( defined( 'BP_ENABLE_MULTIBLOG' ) )
-        $domain = get_blog_option( $current_blog->blog_id, 'home' );
+        $domain = get_home_url( $current_blog->blog_id );
     else
-        $domain = get_blog_option( BP_ROOT_BLOG, 'home' );
+        $domain = get_home_url( BP_ROOT_BLOG );
 
     return apply_filters( 'bp_core_get_root_domain', $domain );

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

@@ -485 +485 @@
             <tr>
                 <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>
-                <td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
+                <td><code><?php echo get_home_url() . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
             </tr>
             <tr>
                 <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>
-                <td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
+                <td><code><?php echo get_home_url() . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
             </tr>
             <tr>
                 <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>
-                <td><code><?php echo get_option('home') . $prefix ?>/archives/123</code></td>
+                <td><code><?php echo get_home_url() . $prefix ?>/archives/123</code></td>
             </tr>
         </table>

trunk/bp-core/bp-core-avatars.php

@@ -568 +568 @@
     // If multisite, and current blog does not match root blog, make adjustments
     if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
-        $upload_dir['baseurl'] = str_replace( get_blog_option( $current_blog->blog_id, 'home' ) , get_blog_option( BP_ROOT_BLOG, 'home' ), $upload_dir['baseurl'] );
+        $upload_dir['baseurl'] = str_replace( get_home_url( $current_blog->blog_id ) , get_home_url( BP_ROOT_BLOG ), $upload_dir['baseurl'] );
 
     return apply_filters( 'bp_core_avatar_url', $upload_dir['baseurl'] );