<!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][5296] trunk: Add function_exists checks for bp_get_settings_slug() where needed.</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/5296">5296</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-11-07 18:49:14 +0000 (Mon, 07 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add function_exists checks for bp_get_settings_slug() where needed. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3712">#3712</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitynotificationsphp">trunk/bp-activity/bp-activity-notifications.php</a></li>
<li><a href="#trunkbpcoredeprecated15php">trunk/bp-core/deprecated/1.5.php</a></li>
<li><a href="#trunkbpfriendsbpfriendsnotificationsphp">trunk/bp-friends/bp-friends-notifications.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsnotificationsphp">trunk/bp-groups/bp-groups-notifications.php</a></li>
<li><a href="#trunkbpmessagesbpmessagesnotificationsphp">trunk/bp-messages/bp-messages-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 (5295 => 5296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-notifications.php 2011-11-07 10:55:48 UTC (rev 5295)
+++ trunk/bp-activity/bp-activity-notifications.php 2011-11-07 18:49:14 UTC (rev 5296)
</span><span class="lines">@@ -53,8 +53,9 @@
</span><span class="cx"> if ( 'no' != bp_get_user_meta( $receiver_user_id, 'notification_activity_new_mention', true ) ) {
</span><span class="cx"> $poster_name = bp_core_get_user_displayname( $activity->user_id );
</span><span class="cx">
</span><del>- $message_link = bp_activity_get_permalink( $activity_id );
- $settings_link = bp_core_get_user_domain( $receiver_user_id ) . bp_get_settings_slug() . '/notifications/';
</del><ins>+ $message_link = bp_activity_get_permalink( $activity_id );
+ $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+ $settings_link = bp_core_get_user_domain( $receiver_user_id ) . $settings_slug . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> $poster_name = stripslashes( $poster_name );
</span><span class="cx"> $content = bp_activity_filter_kses( strip_tags( stripslashes( $activity->content ) ) );
</span><span class="lines">@@ -138,9 +139,10 @@
</span><span class="cx"> $original_activity = new BP_Activity_Activity( $activity_id );
</span><span class="cx">
</span><span class="cx"> if ( $original_activity->user_id != $commenter_id && 'no' != bp_get_user_meta( $original_activity->user_id, 'notification_activity_new_reply', true ) ) {
</span><del>- $poster_name = bp_core_get_user_displayname( $commenter_id );
- $thread_link = bp_activity_get_permalink( $activity_id );
- $settings_link = bp_core_get_user_domain( $original_activity->user_id ) . bp_get_settings_slug() . '/notifications/';
</del><ins>+ $poster_name = bp_core_get_user_displayname( $commenter_id );
+ $thread_link = bp_activity_get_permalink( $activity_id );
+ $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+ $settings_link = bp_core_get_user_domain( $original_activity->user_id ) . $settings_slug . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> $poster_name = stripslashes( $poster_name );
</span><span class="cx"> $content = bp_activity_filter_kses( stripslashes($content) );
</span><span class="lines">@@ -183,9 +185,10 @@
</span><span class="cx"> $parent_comment = new BP_Activity_Activity( $parent_id );
</span><span class="cx">
</span><span class="cx"> if ( $parent_comment->user_id != $commenter_id && $original_activity->user_id != $parent_comment->user_id && 'no' != bp_get_user_meta( $parent_comment->user_id, 'notification_activity_new_reply', true ) ) {
</span><del>- $poster_name = bp_core_get_user_displayname( $commenter_id );
- $thread_link = bp_activity_get_permalink( $activity_id );
- $settings_link = bp_core_get_user_domain( $parent_comment->user_id ) . bp_get_settings_slug() . '/notifications/';
</del><ins>+ $poster_name = bp_core_get_user_displayname( $commenter_id );
+ $thread_link = bp_activity_get_permalink( $activity_id );
+ $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+ $settings_link = bp_core_get_user_domain( $parent_comment->user_id ) . $settings_slug . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $ud = bp_core_get_core_userdata( $parent_comment->user_id );
</span></span></pre></div>
<a id="trunkbpcoredeprecated15php"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/deprecated/1.5.php (5295 => 5296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/deprecated/1.5.php 2011-11-07 10:55:48 UTC (rev 5295)
+++ trunk/bp-core/deprecated/1.5.php 2011-11-07 18:49:14 UTC (rev 5296)
</span><span class="lines">@@ -321,8 +321,9 @@
</span><span class="cx"> if ( 'no' != bp_get_user_meta( $receiver_user_id, 'notification_activity_new_mention', true ) ) {
</span><span class="cx"> $poster_name = bp_core_get_user_displayname( $poster_user_id );
</span><span class="cx">
</span><del>- $message_link = bp_activity_get_permalink( $activity_id );
- $settings_link = bp_core_get_user_domain( $receiver_user_id ) . bp_get_settings_slug() . '/notifications/';
</del><ins>+ $message_link = bp_activity_get_permalink( $activity_id );
+ $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+ $settings_link = bp_core_get_user_domain( $receiver_user_id ) . $settings_slug . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> $poster_name = stripslashes( $poster_name );
</span><span class="cx"> $content = bp_groups_filter_kses( stripslashes( $content ) );
</span></span></pre></div>
<a id="trunkbpfriendsbpfriendsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-friends/bp-friends-notifications.php (5295 => 5296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-friends/bp-friends-notifications.php 2011-11-07 10:55:48 UTC (rev 5295)
+++ trunk/bp-friends/bp-friends-notifications.php 2011-11-07 18:49:14 UTC (rev 5296)
</span><span class="lines">@@ -14,10 +14,10 @@
</span><span class="cx"> $initiator_ud = get_userdata( $initiator_id );
</span><span class="cx">
</span><span class="cx"> $all_requests_link = bp_core_get_user_domain( $friend_id ) . bp_get_friends_slug() . '/requests/';
</span><del>- $settings_link = bp_core_get_user_domain( $friend_id ) . bp_get_settings_slug() . '/notifications';
</del><ins>+ $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+ $settings_link = bp_core_get_user_domain( $friend_id ) . $settings_slug . '/notifications';
+ $initiator_link = bp_core_get_user_domain( $initiator_id );
</ins><span class="cx">
</span><del>- $initiator_link = bp_core_get_user_domain( $initiator_id );
-
</del><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $ud->user_email;
</span><span class="cx"> $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
</span><span class="lines">@@ -57,8 +57,9 @@
</span><span class="cx">
</span><span class="cx"> $ud = get_userdata( $initiator_id );
</span><span class="cx">
</span><del>- $friend_link = bp_core_get_user_domain( $friend_id );
- $settings_link = bp_core_get_user_domain( $initiator_id ) . bp_get_settings_slug() . '/notifications';
</del><ins>+ $friend_link = bp_core_get_user_domain( $friend_id );
+ $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+ $settings_link = bp_core_get_user_domain( $initiator_id ) . $settings_slug . '/notifications';
</ins><span class="cx">
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $ud->user_email;
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-notifications.php (5295 => 5296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-notifications.php 2011-11-07 10:55:48 UTC (rev 5295)
+++ trunk/bp-groups/bp-groups-notifications.php 2011-11-07 18:49:14 UTC (rev 5296)
</span><span class="lines">@@ -18,8 +18,9 @@
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $ud->user_email;
</span><span class="cx">
</span><del>- $group_link = site_url( bp_get_groups_root_slug(). '/' . $group->slug );
- $settings_link = bp_core_get_user_domain( $user_id ) . bp_get_settings_slug() . '/notifications/';
</del><ins>+ $group_link = site_url( bp_get_groups_root_slug(). '/' . $group->slug );
+ $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+ $settings_link = bp_core_get_user_domain( $user_id ) . $settings_slug . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> $message = sprintf( __(
</span><span class="cx"> 'Group details for the group "%1$s" were updated:
</span><span class="lines">@@ -59,8 +60,9 @@
</span><span class="cx"> $requesting_ud = bp_core_get_core_userdata($requesting_user_id);
</span><span class="cx">
</span><span class="cx"> $group_requests = bp_get_group_permalink( $group ) . 'admin/membership-requests';
</span><del>- $profile_link = bp_core_get_user_domain( $requesting_user_id );
- $settings_link = bp_core_get_user_domain( $requesting_user_id ) . bp_get_settings_slug() . '/notifications/';
</del><ins>+ $profile_link = bp_core_get_user_domain( $requesting_user_id );
+ $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+ $settings_link = bp_core_get_user_domain( $requesting_user_id ) . $settings_slug . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $ud->user_email;
</span><span class="lines">@@ -108,8 +110,9 @@
</span><span class="cx">
</span><span class="cx"> $ud = bp_core_get_core_userdata($requesting_user_id);
</span><span class="cx">
</span><del>- $group_link = bp_get_group_permalink( $group );
- $settings_link = bp_core_get_user_domain( $requesting_user_id ) . bp_get_settings_slug() . '/notifications/';
</del><ins>+ $group_link = bp_get_group_permalink( $group );
+ $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+ $settings_link = bp_core_get_user_domain( $requesting_user_id ) . $settings_slug . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $ud->user_email;
</span><span class="lines">@@ -165,12 +168,12 @@
</span><span class="cx"> if ( 'no' == bp_get_user_meta( $user_id, 'notification_groups_admin_promotion', true ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $group = new BP_Groups_Group( $group_id );
- $ud = bp_core_get_core_userdata($user_id);
</del><ins>+ $group = new BP_Groups_Group( $group_id );
+ $ud = bp_core_get_core_userdata($user_id);
+ $group_link = bp_get_group_permalink( $group );
+ $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+ $settings_link = bp_core_get_user_domain( $user_id ) . $settings_slug . '/notifications/';
</ins><span class="cx">
</span><del>- $group_link = bp_get_group_permalink( $group );
- $settings_link = bp_core_get_user_domain( $user_id ) . bp_get_settings_slug() . '/notifications/';
-
</del><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $ud->user_email;
</span><span class="cx"> $sitename = wp_specialchars_decode( get_blog_option( bp_get_root_blog_id(), 'blogname' ), ENT_QUOTES );
</span></span></pre></div>
<a id="trunkbpmessagesbpmessagesnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-messages/bp-messages-notifications.php (5295 => 5296)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-messages/bp-messages-notifications.php 2011-11-07 10:55:48 UTC (rev 5295)
+++ trunk/bp-messages/bp-messages-notifications.php 2011-11-07 18:49:14 UTC (rev 5296)
</span><span class="lines">@@ -17,7 +17,8 @@
</span><span class="cx"> // User data and links
</span><span class="cx"> $ud = get_userdata( $recipient->user_id );
</span><span class="cx"> $message_link = bp_core_get_user_domain( $recipient->user_id ) . bp_get_messages_slug() .'/';
</span><del>- $settings_link = bp_core_get_user_domain( $recipient->user_id ) . bp_get_settings_slug() . '/notifications/';
</del><ins>+ $settings_slug = function_exists( 'bp_get_settings_slug' ) ? bp_get_settings_slug() : 'settings';
+ $settings_link = bp_core_get_user_domain( $recipient->user_id ) . $settings_slug . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> // Sender info
</span><span class="cx"> $sender_name = stripslashes( $sender_name );
</span></span></pre>
</div>
</div>
</body>
</html>