<!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] [2374] trunk: Fixes #1416</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2374</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-20 09:45:31 +0000 (Wed, 20 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1416</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreadminphp">trunk/bp-core/bp-core-admin.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileadminphp">trunk/bp-xprofile/bp-xprofile-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-admin.php (2373 => 2374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-admin.php 2010-01-19 21:43:11 UTC (rev 2373)
+++ trunk/bp-core/bp-core-admin.php 2010-01-20 09:45:31 UTC (rev 2374)
</span><span class="lines">@@ -163,14 +163,7 @@
</span><span class="cx">
</span><span class="cx"> <form action="" method="post" id="bp-admin-component-form">
</span><span class="cx">
</span><del>- <p>
- <?php _e(
- 'By default, all BuddyPress components are enabled. You can selectively disable any of the
- components by using the form below. Your BuddyPress installation will continue to function, however
- the features of the disabled components will no longer be accessible to
- anyone using the site.
- ', 'buddypress' )?>
- </p>
</del><ins>+ <p><?php _e('By default, all BuddyPress components are enabled. You can selectively disable any of the components by using the form below. Your BuddyPress installation will continue to function, however the features of the disabled components will no longer be accessible to anyone using the site.', 'buddypress' ) ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php $disabled_components = get_site_option( 'bp-deactivated-components' ); ?>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-admin.php (2373 => 2374)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-admin.php 2010-01-19 21:43:11 UTC (rev 2373)
+++ trunk/bp-xprofile/bp-xprofile-admin.php 2010-01-20 09:45:31 UTC (rev 2374)
</span><span class="lines">@@ -37,10 +37,7 @@
</span><span class="cx">
</span><span class="cx"> <h2><?php _e( 'Profile Field Setup', 'buddypress') ?></h2>
</span><span class="cx"> <br />
</span><del>- <p><?php _e( 'Your users will distinguish themselves through their profile page.
- You must give them profile fields that allow them to describe themselves
- in a way that is relevant to the theme of your social network.', 'buddypress') ?></p>
-
</del><ins>+ <p><?php _e( 'Your users will distinguish themselves through their profile page. You must give them profile fields that allow them to describe themselves in a way that is relevant to the theme of your social network.', 'buddypress') ?></p>
</ins><span class="cx"> <p><?php _e('NOTE: Any fields in the first group will appear on the signup page.', 'buddypress'); ?></p>
</span><span class="cx">
</span><span class="cx"> <form action="" id="profile-field-form" method="post">
</span></span></pre>
</div>
</div>
</body>
</html>