<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [3343] trunk: Add https support to bp_core_get_root_domain().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3343</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-11-03 19:34:25 +0000 (Wed, 03 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add https support to bp_core_get_root_domain(). Fixes #1948.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreupgradephp">trunk/bp-core/admin/bp-core-upgrade.php</a></li>
<li><a href="#trunkbpcorebpcoreavatarsphp">trunk/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunkbpcorephp">trunk/bp-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoreupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-upgrade.php (3342 => 3343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-upgrade.php 2010-11-03 13:13:34 UTC (rev 3342)
+++ trunk/bp-core/admin/bp-core-upgrade.php 2010-11-03 19:34:25 UTC (rev 3343)
</span><span class="lines">@@ -484,15 +484,15 @@
</span><span class="cx"> <table class="form-table">
</span><span class="cx"> <tr>
</span><span class="cx"> <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>
</span><del>- <td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
</del><ins>+ <td><code><?php echo get_home_url() . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="cx"> <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>
</span><del>- <td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
</del><ins>+ <td><code><?php echo get_home_url() . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr>
</span><span class="cx"> <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>
</span><del>- <td><code><?php echo get_option('home') . $prefix ?>/archives/123</code></td>
</del><ins>+ <td><code><?php echo get_home_url() . $prefix ?>/archives/123</code></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-avatars.php (3342 => 3343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2010-11-03 13:13:34 UTC (rev 3342)
+++ trunk/bp-core/bp-core-avatars.php 2010-11-03 19:34:25 UTC (rev 3343)
</span><span class="lines">@@ -567,7 +567,7 @@
</span><span class="cx">
</span><span class="cx"> // If multisite, and current blog does not match root blog, make adjustments
</span><span class="cx"> if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
</span><del>- $upload_dir['baseurl'] = str_replace( get_blog_option( $current_blog->blog_id, 'home' ) , get_blog_option( BP_ROOT_BLOG, 'home' ), $upload_dir['baseurl'] );
</del><ins>+ $upload_dir['baseurl'] = str_replace( get_home_url( $current_blog->blog_id ) , get_home_url( BP_ROOT_BLOG ), $upload_dir['baseurl'] );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_avatar_url', $upload_dir['baseurl'] );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpcorephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core.php (3342 => 3343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core.php 2010-11-03 13:13:34 UTC (rev 3342)
+++ trunk/bp-core.php 2010-11-03 19:34:25 UTC (rev 3343)
</span><span class="lines">@@ -614,9 +614,9 @@
</span><span class="cx"> global $current_blog;
</span><span class="cx">
</span><span class="cx"> if ( defined( 'BP_ENABLE_MULTIBLOG' ) )
</span><del>- $domain = get_blog_option( $current_blog->blog_id, 'home' );
</del><ins>+ $domain = get_home_url( $current_blog->blog_id );
</ins><span class="cx"> else
</span><del>- $domain = get_blog_option( BP_ROOT_BLOG, 'home' );
</del><ins>+ $domain = get_home_url( BP_ROOT_BLOG );
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_get_root_domain', $domain );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>