<!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" />
<title>[BuddyPress][6022] trunk/bp-core: Pinking shears in Core component</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/6022">6022</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-05-11 17:38:50 +0000 (Fri, 11 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pinking shears in Core component</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreadminphp">trunk/bp-core/bp-core-admin.php</a></li>
<li><a href="#trunkbpcorebpcoreavatarsphp">trunk/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunkbpcorebpcoreclassesphp">trunk/bp-core/bp-core-classes.php</a></li>
<li><a href="#trunkbpcorebpcorefiltersphp">trunk/bp-core/bp-core-filters.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbpcorebpcoreloaderphp">trunk/bp-core/bp-core-loader.php</a></li>
<li><a href="#trunkbpcorebpcoreoptionsphp">trunk/bp-core/bp-core-options.php</a></li>
<li><a href="#trunkbpcorebpcorewidgetsphp">trunk/bp-core/bp-core-widgets.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 (6021 => 6022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-admin.php 2012-05-11 14:25:37 UTC (rev 6021)
+++ trunk/bp-core/bp-core-admin.php 2012-05-11 17:38:50 UTC (rev 6022)
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx"> // Add notice if not using a BuddyPress theme
</span><span class="cx"> add_action( 'admin_notices', array( $this, 'admin_notices' ) );
</span><span class="cx"> add_action( 'network_admin_notices', array( $this, 'admin_notices' ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Enqueue all admin JS and CSS
</span><span class="cx"> add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_scripts' ) );
</span><span class="cx">
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx">
</span><span class="cx"> // Not in maintenance mode
</span><span class="cx"> } else {
</span><del>-
</del><ins>+
</ins><span class="cx"> // Bail if user cannot moderate
</span><span class="cx"> if ( ! bp_current_user_can( 'manage_options' ) )
</span><span class="cx"> return;
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx">
</span><span class="cx"> // Allow subscriptions setting
</span><span class="cx"> add_settings_field( '_bp_group_creation', __( 'Group Creation', 'buddypress' ), 'bp_admin_setting_callback_group_creation', 'buddypress', 'bp_groups' );
</span><del>- register_setting ( 'buddypress', '_bp_group_creation', 'intval' );
</del><ins>+ register_setting ( 'buddypress', '_bp_group_creation', 'intval' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Forums ************************************************************/
</span><span class="lines">@@ -539,7 +539,7 @@
</span><span class="cx"> * @since BuddyPress (1.6)
</span><span class="cx"> *
</span><span class="cx"> * @global string $pagenow
</span><del>- * @return If no notice is needed
</del><ins>+ * @return If no notice is needed
</ins><span class="cx"> */
</span><span class="cx"> public function admin_notices() {
</span><span class="cx"> global $pagenow;
</span></span></pre></div>
<a id="trunkbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-avatars.php (6021 => 6022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2012-05-11 14:25:37 UTC (rev 6021)
+++ trunk/bp-core/bp-core-avatars.php 2012-05-11 17:38:50 UTC (rev 6022)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_set_avatar_constants() {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !defined( 'BP_AVATAR_THUMB_WIDTH' ) )
</span><span class="cx"> define( 'BP_AVATAR_THUMB_WIDTH', 50 );
</span><span class="cx">
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> extract( $params, EXTR_SKIP );
</span><span class="cx">
</span><span class="cx"> /** Set item_id ***********************************************************/
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty( $item_id ) ) {
</span><span class="cx">
</span><span class="cx"> switch ( $object ) {
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'user' :
</span><span class="cx"> default :
</span><span class="cx"> $item_id = bp_displayed_user_id();
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $class = apply_filters( 'bp_core_avatar_class', $class, $item_id, $object, $params );
</span><del>-
</del><ins>+
</ins><span class="cx"> /** Set avatar_dir ********************************************************/
</span><span class="cx">
</span><span class="cx"> if ( empty( $avatar_dir ) ) {
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'user' :
</span><span class="cx"> default :
</span><span class="cx"> $avatar_dir = 'avatars';
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> /** <img> alt *************************************************************/
</span><span class="cx">
</span><span class="cx"> if ( false !== strpos( $alt, '%s' ) || false !== strpos( $alt, '%1$s' ) ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> // Get item name for alt/title tags
</span><span class="cx"> $item_name = '';
</span><span class="cx">
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> case 'group' :
</span><span class="cx"> $item_name = bp_get_group_name( groups_get_group( array( 'group_id' => $item_id ) ) );
</span><span class="cx"> break;
</span><del>-
</del><ins>+
</ins><span class="cx"> case 'user' :
</span><span class="cx"> default :
</span><span class="cx"> $item_name = bp_core_get_user_displayname( $item_id );
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx">
</span><span class="cx"> /** Sanity Checks *********************************************************/
</span><span class="cx">
</span><del>- // Get a fallback for the 'alt' parameter
</del><ins>+ // Get a fallback for the 'alt' parameter
</ins><span class="cx"> if ( empty( $alt ) )
</span><span class="cx"> $alt = __( 'Avatar Image', 'buddypress' );
</span><span class="cx">
</span><span class="lines">@@ -726,7 +726,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_avatar_upload_path() {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> // See if the value has already been calculated and stashed in the $bp global
</span><span class="cx"> if ( isset( $bp->avatar->upload_path ) ) {
</span><span class="cx"> $basedir = $bp->avatar->upload_path;
</span><span class="lines">@@ -739,26 +739,26 @@
</span><span class="cx"> // Switch dynamically in order to support BP_ENABLE_MULTIBLOG
</span><span class="cx"> switch_to_blog( bp_get_root_blog_id() );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Get upload directory information from current site
</span><span class="cx"> $upload_dir = wp_upload_dir();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Directory does not exist and cannot be created
</span><span class="cx"> if ( !empty( $upload_dir['error'] ) ) {
</span><span class="cx"> $basedir = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> } else {
</span><span class="cx"> $basedir = $upload_dir['basedir'];
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Will bail if not switched
</span><span class="cx"> restore_current_blog();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Stash in $bp for later use
</span><span class="cx"> $bp->avatar->upload_path = $basedir;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( 'bp_core_avatar_upload_path', $basedir );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -772,7 +772,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_avatar_url() {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> // See if the value has already been calculated and stashed in the $bp global
</span><span class="cx"> if ( isset( $bp->avatar->url ) ) {
</span><span class="cx"> $baseurl = $bp->avatar->url;
</span><span class="lines">@@ -784,11 +784,11 @@
</span><span class="cx"> } else {
</span><span class="cx"> // Get upload directory information from current site
</span><span class="cx"> $upload_dir = wp_upload_dir();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Directory does not exist and cannot be created
</span><span class="cx"> if ( !empty( $upload_dir['error'] ) ) {
</span><span class="cx"> $baseurl = '';
</span><del>-
</del><ins>+
</ins><span class="cx"> } else {
</span><span class="cx"> $baseurl = $upload_dir['baseurl'];
</span><span class="cx">
</span><span class="lines">@@ -840,9 +840,9 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_avatar_dimension( $type = 'thumb', $h_or_w = 'height' ) {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> $dim = isset( $bp->avatar->{$type}->{$h_or_w} ) ? (int) $bp->avatar->{$type}->{$h_or_w} : false;
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( 'bp_core_avatar_dimension', $dim, $type, $h_or_w );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -904,7 +904,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_avatar_original_max_width() {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( 'bp_core_avatar_original_max_width', (int) $bp->avatar->original_max_width );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -918,7 +918,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_avatar_original_max_filesize() {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( 'bp_core_avatar_original_max_filesize', (int) $bp->avatar->original_max_filesize );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -932,7 +932,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_avatar_default() {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( 'bp_core_avatar_default', $bp->avatar->full->default );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -946,7 +946,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_avatar_default_thumb() {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( 'bp_core_avatar_thumb', $bp->avatar->thumb->default );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-classes.php (6021 => 6022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-classes.php 2012-05-11 14:25:37 UTC (rev 6021)
+++ trunk/bp-core/bp-core-classes.php 2012-05-11 17:38:50 UTC (rev 6022)
</span><span class="lines">@@ -274,17 +274,17 @@
</span><span class="cx"> } else {
</span><span class="cx"> $uids = $wpdb->escape( $include );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !empty( $uids ) ) {
</span><span class="cx"> $sql['where_users'] = "AND u.ID IN ({$uids})";
</span><span class="cx"> }
</span><span class="cx"> } elseif ( !empty( $user_id ) && bp_is_active( 'friends' ) ) {
</span><span class="cx"> $friend_ids = friends_get_friend_user_ids( $user_id );
</span><span class="cx"> $friend_ids = $wpdb->escape( implode( ',', (array) $friend_ids ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !empty( $friend_ids ) ) {
</span><span class="cx"> $sql['where_friends'] = "AND u.ID IN ({$friend_ids})";
</span><del>-
</del><ins>+
</ins><span class="cx"> // User has no friends, return false since there will be no users to fetch.
</span><span class="cx"> } else {
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkbpcorebpcorefiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-filters.php (6021 => 6022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-filters.php 2012-05-11 14:25:37 UTC (rev 6021)
+++ trunk/bp-core/bp-core-filters.php 2012-05-11 17:38:50 UTC (rev 6022)
</span><span class="lines">@@ -21,14 +21,14 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_exclude_pages( $pages ) {
</span><span class="cx"> global $bp;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( bp_is_root_blog() ) {
</span><span class="cx"> if ( !empty( $bp->pages->activate ) )
</span><span class="cx"> $pages[] = $bp->pages->activate->id;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !empty( $bp->pages->register ) )
</span><span class="cx"> $pages[] = $bp->pages->register->id;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !empty( $bp->pages->forums ) && ( !bp_is_active( 'forums' ) || ( bp_is_active( 'forums' ) && bp_forums_has_directory() && !bp_forums_is_installed_correctly() ) ) )
</span><span class="cx"> $pages[] = $bp->pages->forums->id;
</span><span class="cx"> }
</span><span class="lines">@@ -278,11 +278,11 @@
</span><span class="cx">
</span><span class="cx"> // Get the component's ID to try and get it's name
</span><span class="cx"> $component_id = $component_name = bp_current_component();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Use the actual component name
</span><span class="cx"> if ( !empty( $bp->{$component_id}->name ) ) {
</span><span class="cx"> $component_name = $bp->{$component_id}->name;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Fall back on the component ID (probably same as current_component)
</span><span class="cx"> } elseif ( !empty( $bp->{$component_id}->id ) ) {
</span><span class="cx"> $component_name = $bp->{$component_id}->id;
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (6021 => 6022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2012-05-11 14:25:37 UTC (rev 6021)
+++ trunk/bp-core/bp-core-functions.php 2012-05-11 17:38:50 UTC (rev 6022)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> $retval = 0;
</span><span class="cx"> if ( !empty( $bp->db_version_raw ) )
</span><span class="cx"> $retval = $bp->db_version_raw;
</span><del>-
</del><ins>+
</ins><span class="cx"> return $retval;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -480,7 +480,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !is_user_logged_in() )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> $user_id = bp_loggedin_user_id();
</span><span class="cx">
</span><span class="cx"> if ( bp_is_user_inactive( $user_id ) )
</span><span class="lines">@@ -949,7 +949,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * A utility for parsing individual function arguments into an array.
</span><span class="cx"> *
</span><del>- * The purpose of this function is to help with backward compatibility in cases where
</del><ins>+ * The purpose of this function is to help with backward compatibility in cases where
</ins><span class="cx"> *
</span><span class="cx"> * function foo( $bar = 1, $baz = false, $barry = array(), $blip = false ) { // ...
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkbpcorebpcoreloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-loader.php (6021 => 6022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-loader.php 2012-05-11 14:25:37 UTC (rev 6021)
+++ trunk/bp-core/bp-core-loader.php 2012-05-11 17:38:50 UTC (rev 6022)
</span><span class="lines">@@ -36,10 +36,10 @@
</span><span class="cx"> *
</span><span class="cx"> * This involves figuring out the currently required, active, deactive,
</span><span class="cx"> * and optional components.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since BuddyPress (1.5)
</span><span class="cx"> *
</span><del>- * @global BuddyPress $bp
</del><ins>+ * @global BuddyPress $bp
</ins><span class="cx"> */
</span><span class="cx"> private function bootstrap() {
</span><span class="cx"> global $bp;
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.5)
</span><span class="cx"> *
</span><del>- * @global BuddyPress $bp
</del><ins>+ * @global BuddyPress $bp
</ins><span class="cx"> */
</span><span class="cx"> function setup_globals() {
</span><span class="cx"> global $bp;
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6)
</span><span class="cx"> *
</span><del>- * @global BuddyPress $bp
</del><ins>+ * @global BuddyPress $bp
</ins><span class="cx"> */
</span><span class="cx"> function bp_setup_core() {
</span><span class="cx"> global $bp;
</span></span></pre></div>
<a id="trunkbpcorebpcoreoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-options.php (6021 => 6022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-options.php 2012-05-11 14:25:37 UTC (rev 6021)
+++ trunk/bp-core/bp-core-options.php 2012-05-11 17:38:50 UTC (rev 6022)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> // Users from all sites can post
</span><span class="cx"> '_bp_enable_akismet' => true,
</span><del>-
</del><ins>+
</ins><span class="cx"> /** BuddyBar **********************************************************/
</span><span class="cx">
</span><span class="cx"> // Force the BuddyBar
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> * This is destructive, so existing settings will be destroyed.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6)
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @uses bp_get_default_options() To get default options
</span><span class="cx"> * @uses delete_option() Removes default options
</span><span class="cx"> * @uses do_action() Calls 'bp_delete_options'
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * When switching from single to multisite we need to copy blog options to
</span><span class="cx"> * site options.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * This function is no longer used
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> // Sitemeta comes second in the merge, so that network 'registration' value wins
</span><span class="cx"> $root_blog_options_meta = array_merge( $root_blog_options_meta, $network_options_meta );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Missing some options, so do some one-time fixing
</span><span class="cx"> if ( empty( $root_blog_options_meta ) || ( count( $root_blog_options_meta ) < count( $root_blog_option_keys ) ) ) {
</span><span class="cx">
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> // Update the global array
</span><span class="cx"> $root_blog_options_meta[$old_meta_key] = $old_meta_value;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $root_blog_options_meta = array_merge( $root_blog_options_meta, $existing_options );
</span><span class="cx"> unset( $existing_options );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcorewidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-widgets.php (6021 => 6022)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-widgets.php 2012-05-11 14:25:37 UTC (rev 6021)
+++ trunk/bp-core/bp-core-widgets.php 2012-05-11 17:38:50 UTC (rev 6022)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx"> $instance['member_default'] = 'active';
</span><span class="cx">
</span><span class="cx"> echo $before_widget;
</span><del>-
</del><ins>+
</ins><span class="cx"> $title = $instance['link_title'] ? '<a href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ) . '">' . $instance['title'] . '</a>' : $instance['title'];
</span><del>-
</del><ins>+
</ins><span class="cx"> echo $before_title
</span><span class="cx"> . $title
</span><span class="cx"> . $after_title; ?>
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">
</span><span class="cx"> function update( $new_instance, $old_instance ) {
</span><span class="cx"> $instance = $old_instance;
</span><del>-
</del><ins>+
</ins><span class="cx"> $instance['title'] = strip_tags( $new_instance['title'] );
</span><span class="cx"> $instance['max_members'] = strip_tags( $new_instance['max_members'] );
</span><span class="cx"> $instance['member_default'] = strip_tags( $new_instance['member_default'] );
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <p><label for="bp-core-widget-title"><?php _e('Title:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" style="width: 100%" /></label></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p><label for="<?php echo $this->get_field_name('link_title') ?>"><input type="checkbox" name="<?php echo $this->get_field_name('link_title') ?>" value="1" <?php checked( $link_title ) ?> /> <?php _e( 'Link widget title to Members directory', 'buddypress' ) ?></label></p>
</span><span class="cx">
</span><span class="cx"> <p><label for="bp-core-widget-members-max"><?php _e('Max members to show:', 'buddypress'); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_members' ); ?>" name="<?php echo $this->get_field_name( 'max_members' ); ?>" type="text" value="<?php echo esc_attr( $max_members ); ?>" style="width: 30%" /></label></p>
</span></span></pre>
</div>
</div>
</body>
</html>