<!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] [2302] trunk: Fixed incorrect echo on bp_root_domain() calls.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2302</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-15 11:59:28 +0000 (Fri, 15 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixed incorrect echo on bp_root_domain() calls. Fixed #1288. Added warning to theme headers about copying themes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsphp">trunk/bp-blogs.php</a></li>
<li><a href="#trunkbpcorebpcorewpabstractionphp">trunk/bp-core/bp-core-wpabstraction.php</a></li>
<li><a href="#trunkbploaderphp">trunk/bp-loader.php</a></li>
<li><a href="#trunkbpthemesbpdefaultblogscreatephp">trunk/bp-themes/bp-default/blogs/create.php</a></li>
<li><a href="#trunkbpthemesbpdefaultblogsindexphp">trunk/bp-themes/bp-default/blogs/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupscreatephp">trunk/bp-themes/bp-default/groups/create.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupsindexphp">trunk/bp-themes/bp-default/groups/index.php</a></li>
<li><a href="#trunkbpthemesbpdefaultmembersmembersloopphp">trunk/bp-themes/bp-default/members/members-loop.php</a></li>
<li><a href="#trunkbpthemesbpdefaultsidebarphp">trunk/bp-themes/bp-default/sidebar.php</a></li>
<li><a href="#trunkbpthemesbpdefaultstylecss">trunk/bp-themes/bp-default/style.css</a></li>
<li><a href="#trunkbpthemesbpsnparentheaderphp">trunk/bp-themes/bp-sn-parent/header.php</a></li>
<li><a href="#trunkbpthemesbpsnparentstylecss">trunk/bp-themes/bp-sn-parent/style.css</a></li>
<li><a href="#trunkbpthemesbpsnparentuserbarphp">trunk/bp-themes/bp-sn-parent/userbar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs.php (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs.php 2010-01-15 11:43:27 UTC (rev 2301)
+++ trunk/bp-blogs.php 2010-01-15 11:59:28 UTC (rev 2302)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-define ( 'BP_BLOGS_DB_VERSION', '1800' );
</del><ins>+define ( 'BP_BLOGS_DB_VERSION', '2000' );
</ins><span class="cx">
</span><span class="cx"> /* Define the slug for the component */
</span><span class="cx"> if ( !defined( 'BP_BLOGS_SLUG' ) )
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> dbDelta($sql);
</span><span class="cx">
</span><span class="cx"> // On first installation - record all existing blogs in the system.
</span><del>- if ( !(int)get_site_option( 'bp-blogs-first-install') ) {
</del><ins>+ if ( !(int)get_site_option( 'bp-blogs-first-install') && bp_core_is_multisite() ) {
</ins><span class="cx"> bp_blogs_record_existing_blogs();
</span><span class="cx"> add_site_option( 'bp-blogs-first-install', 1 );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpcorebpcorewpabstractionphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-wpabstraction.php (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-wpabstraction.php 2010-01-15 11:43:27 UTC (rev 2301)
+++ trunk/bp-core/bp-core-wpabstraction.php 2010-01-15 11:59:28 UTC (rev 2302)
</span><span class="lines">@@ -49,6 +49,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if ( !function_exists( 'delete_site_option' ) ) {
+ function delete_site_option( $option_name ) {
+ return delete_option( $option_name );
+ }
+}
+
</ins><span class="cx"> if ( !function_exists( 'get_blog_option' ) ) {
</span><span class="cx"> function get_blog_option( $blog_id, $option_name, $default = false ) {
</span><span class="cx"> return get_option( $option_name, $default );
</span></span></pre></div>
<a id="trunkbploaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-loader.php (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-loader.php 2010-01-15 11:43:27 UTC (rev 2301)
+++ trunk/bp-loader.php 2010-01-15 11:59:28 UTC (rev 2302)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> delete_site_option( 'bp-messages-db-version' );
</span><span class="cx"> delete_site_option( 'bp-xprofile-db-version' );
</span><span class="cx"> delete_site_option( 'bp-deactivated-components' );
</span><ins>+ delete_site_option( 'bp-blogs-first-install' );
</ins><span class="cx">
</span><span class="cx"> do_action( 'bp_loader_deactivate' );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultblogscreatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/blogs/create.php (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/blogs/create.php 2010-01-15 11:43:27 UTC (rev 2301)
+++ trunk/bp-themes/bp-default/blogs/create.php 2010-01-15 11:59:28 UTC (rev 2302)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'template_notices' ) ?>
</span><span class="cx">
</span><del>- <h2><?php _e( 'Create a Blog', 'buddypress' ) ?> &nbsp;<a class="button" href="<?php echo bp_root_domain() . '/' . BP_BLOGS_SLUG . '/' ?>"><?php _e( 'Blogs Directory', 'buddypress' ) ?></a></h2>
</del><ins>+ <h2><?php _e( 'Create a Blog', 'buddypress' ) ?> &nbsp;<a class="button" href="<?php bp_root_domain() . '/' . BP_BLOGS_SLUG . '/' ?>"><?php _e( 'Blogs Directory', 'buddypress' ) ?></a></h2>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_create_blog_content' ) ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultblogsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/blogs/index.php (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/blogs/index.php 2010-01-15 11:43:27 UTC (rev 2301)
+++ trunk/bp-themes/bp-default/blogs/index.php 2010-01-15 11:59:28 UTC (rev 2302)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> <form action="" method="post" id="blogs-directory-form" class="dir-form">
</span><span class="cx">
</span><del>- <h2><?php _e( 'Blogs Directory', 'buddypress' ) ?><?php if ( is_user_logged_in() && bp_blog_signup_enabled() ) : ?> &nbsp;<a class="button" href="<?php echo bp_root_domain() . '/' . BP_BLOGS_SLUG . '/create/' ?>"><?php _e( 'Create a Blog', 'buddypress' ) ?></a><?php endif; ?></h2>
</del><ins>+ <h2><?php _e( 'Blogs Directory', 'buddypress' ) ?><?php if ( is_user_logged_in() && bp_blog_signup_enabled() ) : ?> &nbsp;<a class="button" href="<?php bp_root_domain() . '/' . BP_BLOGS_SLUG . '/create/' ?>"><?php _e( 'Create a Blog', 'buddypress' ) ?></a><?php endif; ?></h2>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_directory_blogs_content' ) ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupscreatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/create.php (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/create.php 2010-01-15 11:43:27 UTC (rev 2301)
+++ trunk/bp-themes/bp-default/groups/create.php 2010-01-15 11:59:28 UTC (rev 2302)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <div class="padder">
</span><span class="cx">
</span><span class="cx"> <form action="<?php bp_group_creation_form_action() ?>" method="post" id="create-group-form" class="standard-form" enctype="multipart/form-data">
</span><del>- <h2><?php _e( 'Create a Group', 'buddypress' ) ?> &nbsp;<a class="button" href="<?php echo bp_root_domain() . '/' . BP_GROUPS_SLUG . '/' ?>"><?php _e( 'Groups Directory', 'buddypress' ) ?></a></h2>
</del><ins>+ <h2><?php _e( 'Create a Group', 'buddypress' ) ?> &nbsp;<a class="button" href="<?php bp_root_domain() . '/' . BP_GROUPS_SLUG . '/' ?>"><?php _e( 'Groups Directory', 'buddypress' ) ?></a></h2>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_create_group' ) ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupsindexphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/index.php (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/index.php 2010-01-15 11:43:27 UTC (rev 2301)
+++ trunk/bp-themes/bp-default/groups/index.php 2010-01-15 11:59:28 UTC (rev 2302)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <div class="padder">
</span><span class="cx">
</span><span class="cx"> <form action="" method="post" id="groups-directory-form" class="dir-form">
</span><del>- <h2><?php _e( 'Groups Directory', 'buddypress' ) ?><?php if ( is_user_logged_in() ) : ?> &nbsp;<a class="button" href="<?php echo bp_root_domain() . '/' . BP_GROUPS_SLUG . '/create/' ?>"><?php _e( 'Create a Group', 'buddypress' ) ?></a><?php endif; ?></h2>
</del><ins>+ <h2><?php _e( 'Groups Directory', 'buddypress' ) ?><?php if ( is_user_logged_in() ) : ?> &nbsp;<a class="button" href="<?php bp_root_domain() . '/' . BP_GROUPS_SLUG . '/create/' ?>"><?php _e( 'Create a Group', 'buddypress' ) ?></a><?php endif; ?></h2>
</ins><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_directory_groups_content' ) ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultmembersmembersloopphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/members/members-loop.php (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/members/members-loop.php 2010-01-15 11:43:27 UTC (rev 2301)
+++ trunk/bp-themes/bp-default/members/members-loop.php 2010-01-15 11:59:28 UTC (rev 2302)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> * but it'll add an extra query for each member in the loop
</span><span class="cx"> * (only one regadless of the number of fields you show):
</span><span class="cx"> *
</span><del>- * bp_member_profile_field_data( 'field=the field name' );
</del><ins>+ * bp_member_profile_data( 'field=the field name' );
</ins><span class="cx"> */
</span><span class="cx"> ?>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultsidebarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/sidebar.php (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/sidebar.php 2010-01-15 11:43:27 UTC (rev 2301)
+++ trunk/bp-themes/bp-default/sidebar.php 2010-01-15 11:59:28 UTC (rev 2302)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> <p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="userbar_rememberme" value="forever" /> <?php _e( 'Remember Me', 'buddypress' ) ?></label></p>
</span><span class="cx">
</span><span class="cx"> <input type="submit" name="wp-submit" id="userbar_wp-submit" value="<?php _e('Log In'); ?>" tabindex="100" />
</span><del>- <input type="hidden" name="redirect_to" value="<?php echo bp_root_domain() ?>" />
</del><ins>+ <input type="hidden" name="redirect_to" value="<?php bp_root_domain() ?>" />
</ins><span class="cx"> <input type="hidden" name="testcookie" value="1" />
</span><span class="cx"> </form>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultstylecss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/style.css (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/style.css 2010-01-15 11:43:27 UTC (rev 2301)
+++ trunk/bp-themes/bp-default/style.css 2010-01-15 11:59:28 UTC (rev 2302)
</span><span class="lines">@@ -6,6 +6,13 @@
</span><span class="cx"> Author: BuddyPress.org
</span><span class="cx"> Author URI: http://buddypress.org
</span><span class="cx"> Tags: buddypress, two-columns, custom-header, white, blue
</span><ins>+
+** IMPORTANT **
+If you want to make a custom theme based on this theme, DO NOT copy and edit it. By
+doing this you will make upgrades and maintainence much harder for yourself.
+Instead, please read this codex page on how to build a BuddyPress child themes:
+
+http://codex.buddypress.org/how-to-guides/building-a-buddypress-child-theme/
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /***
</span></span></pre></div>
<a id="trunkbpthemesbpsnparentheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/header.php (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/header.php 2010-01-15 11:43:27 UTC (rev 2301)
+++ trunk/bp-themes/bp-sn-parent/header.php 2010-01-15 11:59:28 UTC (rev 2302)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> <input type="button" name="signup-submit" id="signup-submit" value="<?php _e( 'Sign Up', 'buddypress' ) ?>" onclick="location.href='<?php echo bp_signup_page() ?>'" />
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <input type="hidden" name="redirect_to" value="<?php echo bp_root_domain() ?>" />
</del><ins>+ <input type="hidden" name="redirect_to" value="<?php bp_root_domain() ?>" />
</ins><span class="cx"> <input type="hidden" name="testcookie" value="1" />
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_login_bar_logged_out' ) ?>
</span></span></pre></div>
<a id="trunkbpthemesbpsnparentstylecss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/style.css (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/style.css 2010-01-15 11:43:27 UTC (rev 2301)
+++ trunk/bp-themes/bp-sn-parent/style.css 2010-01-15 11:59:28 UTC (rev 2302)
</span><span class="lines">@@ -5,6 +5,13 @@
</span><span class="cx"> Version: 1.2-rare
</span><span class="cx"> Author: BuddyPress.org
</span><span class="cx"> Author URI: http://buddypress.org
</span><ins>+
+** IMPORTANT **
+If you want to make a custom theme based on this theme, DO NOT copy and edit it. By
+doing this you will make upgrades and maintainence much harder for yourself.
+Instead, please read this codex page on how to build a BuddyPress child themes:
+
+http://codex.buddypress.org/how-to-guides/building-a-buddypress-child-theme/
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /* Font styles */
</span></span></pre></div>
<a id="trunkbpthemesbpsnparentuserbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/userbar.php (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/userbar.php 2010-01-15 11:43:27 UTC (rev 2301)
+++ trunk/bp-themes/bp-sn-parent/userbar.php 2010-01-15 11:59:28 UTC (rev 2302)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> <p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="userbar_rememberme" value="forever" /> <?php _e( 'Remember Me', 'buddypress' ) ?></label></p>
</span><span class="cx"> <p class="submit">
</span><span class="cx"> <input type="submit" name="wp-submit" id="userbar_wp-submit" value="<?php _e('Log In'); ?>" tabindex="100" />
</span><del>- <input type="hidden" name="redirect_to" value="<?php echo bp_root_domain() ?>" />
</del><ins>+ <input type="hidden" name="redirect_to" value="<?php bp_root_domain() ?>" />
</ins><span class="cx"> <input type="hidden" name="testcookie" value="1" />
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span></span></pre>
</div>
</div>
</body>
</html>