<!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] [2480] trunk: Fixes #1730</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2480</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-30 11:42:55 +0000 (Sat, 30 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1730</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitynotificationsphp">trunk/bp-activity/bp-activity-notifications.php</a></li>
<li><a href="#trunkbpcorebpcoreadminphp">trunk/bp-core/bp-core-admin.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsnotificationsphp">trunk/bp-groups/bp-groups-notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitynotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-notifications.php (2479 => 2480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-notifications.php 2010-01-29 18:01:36 UTC (rev 2479)
+++ trunk/bp-activity/bp-activity-notifications.php 2010-01-30 11:42:55 UTC (rev 2480)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> To view and respond to the message, log in and visit: %s
</span><span class="cx">
</span><span class="cx"> ---------------------
</span><del>-', 'buddypress' ), $poster_name, wp_filter_kses( stripslashes($content) ), $message_link );
</del><ins>+', 'buddypress' ), $poster_name, wp_filter_kses( stripslashes_deep($content) ), $message_link );
</ins><span class="cx">
</span><span class="cx"> $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-admin.php (2479 => 2480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-admin.php 2010-01-29 18:01:36 UTC (rev 2479)
+++ trunk/bp-core/bp-core-admin.php 2010-01-30 11:42:55 UTC (rev 2480)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif; ?>
</span><del>- <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') ) : ?>
</del><ins>+ <?php if ( file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') && bp_core_is_multisite() ) : ?>
</ins><span class="cx"> <tr>
</span><span class="cx"> <td><h3><?php _e( 'Blog Tracking', 'buddypress' ) ?></h3><p><?php _e( 'Tracks blogs, blog posts and blogs comments for a user across a WPMU installation.', 'buddypress' ) ?></p></td>
</span><span class="cx"> <td>
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (2479 => 2480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-01-29 18:01:36 UTC (rev 2479)
+++ trunk/bp-core/bp-core-templatetags.php 2010-01-30 11:42:55 UTC (rev 2480)
</span><span class="lines">@@ -1009,7 +1009,7 @@
</span><span class="cx"> $selection_box .= '<option value="forums">' . __( 'Forums', 'buddypress' ) . '</option>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( function_exists( 'bp_blogs_install' ) ) {
</del><ins>+ if ( function_exists( 'bp_blogs_install' ) && bp_core_is_multisite() ) {
</ins><span class="cx"> $selection_box .= '<option value="blogs">' . __( 'Blogs', 'buddypress' ) . '</option>';
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-notifications.php (2479 => 2480)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-notifications.php 2010-01-29 18:01:36 UTC (rev 2479)
+++ trunk/bp-groups/bp-groups-notifications.php 2010-01-30 11:42:55 UTC (rev 2480)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> To view and respond to the message, log in and visit: %s
</span><span class="cx">
</span><span class="cx"> ---------------------
</span><del>-', 'buddypress' ), $poster_name, wp_filter_kses( stripslashes( $group->name ) ), wp_filter_kses( stripslashes($content) ), $message_link );
</del><ins>+', 'buddypress' ), $poster_name, wp_filter_kses( stripslashes_deep( $group->name ) ), wp_filter_kses( stripslashes_deep($content) ), $message_link );
</ins><span class="cx">
</span><span class="cx"> $message .= sprintf( __( 'To disable these notifications please log in and go to: %s', 'buddypress' ), $settings_link );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>