<!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] [2123] branches/1.1: Fixes #1249</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2123</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2009-11-25 11:56:18 +0000 (Wed, 25 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1249</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches11bpcorebpcoresettingsphp">branches/1.1/bp-core/bp-core-settings.php</a></li>
<li><a href="#branches11bpfriendsbpfriendsnotificationsphp">branches/1.1/bp-friends/bp-friends-notifications.php</a></li>
<li><a href="#branches11bpgroupsbpgroupsnotificationsphp">branches/1.1/bp-groups/bp-groups-notifications.php</a></li>
<li><a href="#branches11bpmessagesbpmessagesnotificationsphp">branches/1.1/bp-messages/bp-messages-notifications.php</a></li>
<li><a href="#branches11bpxprofilebpxprofilenotificationsphp">branches/1.1/bp-xprofile/bp-xprofile-notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches11bpcorebpcoresettingsphp"></a>
<div class="modfile"><h4>Modified: branches/1.1/bp-core/bp-core-settings.php (2122 => 2123)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.1/bp-core/bp-core-settings.php 2009-11-25 11:43:02 UTC (rev 2122)
+++ branches/1.1/bp-core/bp-core-settings.php 2009-11-25 11:56:18 UTC (rev 2123)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> /* Add the settings navigation item */
</span><span class="cx"> bp_core_new_nav_item( array( 'name' => __('Settings', 'buddypress'), 'slug' => $bp->settings->slug, 'position' => 100, 'show_for_displayed_user' => false, 'screen_function' => 'bp_core_screen_general_settings', 'default_subnav_slug' => 'general' ) );
</span><span class="cx">
</span><del>- $settings_link = $bp->loggedin_user->domain . 'settings/';
</del><ins>+ $settings_link = $bp->loggedin_user->domain . BP_SETTINGS_SLUG . '/';
</ins><span class="cx">
</span><span class="cx"> bp_core_new_subnav_item( array( 'name' => __( 'General', 'buddypress' ), 'slug' => 'general', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_general_settings', 'position' => 10, 'user_has_access' => bp_is_home() ) );
</span><span class="cx"> bp_core_new_subnav_item( array( 'name' => __( 'Notifications', 'buddypress' ), 'slug' => 'notifications', 'parent_url' => $settings_link, 'parent_slug' => $bp->settings->slug, 'screen_function' => 'bp_core_screen_notification_settings', 'position' => 20, 'user_has_access' => bp_is_home() ) );
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><del>- <form action="<?php echo $bp->loggedin_user->domain . 'settings/general' ?>" method="post" class="standard-form" id="settings-form">
</del><ins>+ <form action="<?php echo $bp->loggedin_user->domain . $bp->settings->slug . '/general' ?>" method="post" class="standard-form" id="settings-form">
</ins><span class="cx"> <label for="email"><?php _e( 'Account Email', 'buddypress' ) ?></label>
</span><span class="cx"> <input type="text" name="email" id="email" value="<?php echo attribute_escape( $current_user->user_email ); ?>" class="settings-input" />
</span><span class="cx">
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><del>- <form action="<?php echo $bp->loggedin_user->domain . 'settings/notifications' ?>" method="post" id="settings-form">
</del><ins>+ <form action="<?php echo $bp->loggedin_user->domain . $bp->settings->slug . '/notifications' ?>" method="post" id="settings-form">
</ins><span class="cx"> <h3><?php _e( 'Email Notifications', 'buddypress' ) ?></h3>
</span><span class="cx"> <p><?php _e( 'Send a notification by email when:', 'buddypress' ) ?></p>
</span><span class="cx">
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> function bp_core_screen_delete_account_content() {
</span><span class="cx"> global $bp, $current_user, $bp_settings_updated, $pass_error; ?>
</span><span class="cx">
</span><del>- <form action="<?php echo $bp->loggedin_user->domain . 'settings/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
</del><ins>+ <form action="<?php echo $bp->loggedin_user->domain . $bp->settings->slug . '/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
</ins><span class="cx">
</span><span class="cx"> <div id="message" class="info">
</span><span class="cx"> <p><?php _e( 'WARNING: Deleting your account will completely remove ALL content associated with it. There is no way back, please be careful with this option.', 'buddypress' ); ?></p>
</span></span></pre></div>
<a id="branches11bpfriendsbpfriendsnotificationsphp"></a>
<div class="modfile"><h4>Modified: branches/1.1/bp-friends/bp-friends-notifications.php (2122 => 2123)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.1/bp-friends/bp-friends-notifications.php 2009-11-25 11:43:02 UTC (rev 2122)
+++ branches/1.1/bp-friends/bp-friends-notifications.php 2009-11-25 11:56:18 UTC (rev 2123)
</span><span class="lines">@@ -12,7 +12,7 @@
</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 ) . 'friends/requests/';
</span><del>- $settings_link = bp_core_get_user_domain( $friend_id ) . 'settings/notifications';
</del><ins>+ $settings_link = bp_core_get_user_domain( $friend_id ) . $bp->settings->slug . '/notifications';
</ins><span class="cx">
</span><span class="cx"> $initiator_link = bp_core_get_user_domain( $initiator_id );
</span><span class="cx">
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> $ud = get_userdata( $initiator_id );
</span><span class="cx">
</span><span class="cx"> $friend_link = bp_core_get_user_domain( $friend_id );
</span><del>- $settings_link = bp_core_get_user_domain( $initiator_id ) . 'settings/notifications';
</del><ins>+ $settings_link = bp_core_get_user_domain( $initiator_id ) . $bp->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="branches11bpgroupsbpgroupsnotificationsphp"></a>
<div class="modfile"><h4>Modified: branches/1.1/bp-groups/bp-groups-notifications.php (2122 => 2123)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.1/bp-groups/bp-groups-notifications.php 2009-11-25 11:43:02 UTC (rev 2122)
+++ branches/1.1/bp-groups/bp-groups-notifications.php 2009-11-25 11:56:18 UTC (rev 2123)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">
</span><span class="cx"> $wire_link = site_url( $bp->groups->slug . '/' . $group->slug . '/wire/' );
</span><span class="cx"> $group_link = site_url( $bp->groups->slug . '/' . $group->slug . '/' );
</span><del>- $settings_link = bp_core_get_user_domain( $user->user_id ) . 'settings/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $user->user_id ) . $bp->settings->slug . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> $message = sprintf( __(
</span><span class="cx"> '%s posted on the wire of the group "%s":
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> $to = $ud->user_email;
</span><span class="cx">
</span><span class="cx"> $group_link = site_url( $bp->groups->slug . '/' . $group->slug );
</span><del>- $settings_link = bp_core_get_user_domain( $user->user_id ) . 'settings/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $user->user_id ) . $bp->settings->slug . '/notifications/';
</ins><span class="cx">
</span><span class="cx"> $message = sprintf( __(
</span><span class="cx"> 'Group details for the group "%s" were updated:
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> $group_requests = bp_get_group_permalink( $group ) . '/admin/membership-requests';
</span><span class="cx"> $profile_link = bp_core_get_user_domain( $requesting_user_id );
</span><del>- $settings_link = bp_core_get_user_domain( $requesting_user_id ) . 'settings/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $requesting_user_id ) . $bp->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">@@ -141,7 +141,7 @@
</span><span class="cx"> $ud = get_userdata($requesting_user_id);
</span><span class="cx">
</span><span class="cx"> $group_link = bp_get_group_permalink( $group );
</span><del>- $settings_link = bp_core_get_user_domain( $requesting_user_id ) . 'settings/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $requesting_user_id ) . $bp->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">@@ -194,7 +194,7 @@
</span><span class="cx"> $ud = get_userdata($user_id);
</span><span class="cx">
</span><span class="cx"> $group_link = bp_get_group_permalink( $group );
</span><del>- $settings_link = bp_core_get_user_domain( $user_id ) . 'settings/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $user_id ) . $bp->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">@@ -236,7 +236,7 @@
</span><span class="cx">
</span><span class="cx"> $invited_ud = get_userdata($invited_user_id);
</span><span class="cx">
</span><del>- $settings_link = bp_core_get_user_domain( $invited_user_id ) . 'settings/notifications/';
</del><ins>+ $settings_link = bp_core_get_user_domain( $invited_user_id ) . $bp->settings->slug . '/notifications/';
</ins><span class="cx"> $invited_link = bp_core_get_user_domain( $invited_user_id );
</span><span class="cx"> $invites_link = $invited_link . $bp->groups->slug . '/invites';
</span><span class="cx">
</span></span></pre></div>
<a id="branches11bpmessagesbpmessagesnotificationsphp"></a>
<div class="modfile"><h4>Modified: branches/1.1/bp-messages/bp-messages-notifications.php (2122 => 2123)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.1/bp-messages/bp-messages-notifications.php 2009-11-25 11:43:02 UTC (rev 2122)
+++ branches/1.1/bp-messages/bp-messages-notifications.php 2009-11-25 11:56:18 UTC (rev 2123)
</span><span class="lines">@@ -12,8 +12,8 @@
</span><span class="cx"> if ( $message->sender_id == $recipient_ids[$i] || 'no' == get_usermeta( $recipient_ids[$i], 'notification_messages_new_message' ) ) continue;
</span><span class="cx">
</span><span class="cx"> $ud = get_userdata( $recipient_ids[$i] );
</span><del>- $message_link = bp_core_get_user_domain( $recipient_ids[$i] ) . 'messages/view/' . $message->id;
- $settings_link = bp_core_get_user_domain( $recipient_ids[$i] ) . 'settings/notifications';
</del><ins>+ $message_link = bp_core_get_user_domain( $recipient_ids[$i] ) . $bp->messages->slug . '/view/' . $message->id;
+ $settings_link = bp_core_get_user_domain( $recipient_ids[$i] ) . $bp->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">@@ -48,8 +48,8 @@
</span><span class="cx"> for ( $i = 0; $i < count($users); $i++ ) {
</span><span class="cx"> if ( get_usermeta( $users[$i]->user_id, 'notification_messages_new_notice' ) == 'no' ) continue;
</span><span class="cx">
</span><del>- $message_link = bp_core_get_user_domain( $users[$i]->user_id ) . 'messages';
- $settings_link = bp_core_get_user_domain( $users[$i]->user_id ) . 'settings/notifications';
</del><ins>+ $message_link = bp_core_get_user_domain( $users[$i]->user_id ) . $bp->messages->slug;
+ $settings_link = bp_core_get_user_domain( $users[$i]->user_id ) . $bp->settings->slug . '/notifications';
</ins><span class="cx">
</span><span class="cx"> // Set up and send the message
</span><span class="cx"> $to = $users[$i]->user_email;
</span></span></pre></div>
<a id="branches11bpxprofilebpxprofilenotificationsphp"></a>
<div class="modfile"><h4>Modified: branches/1.1/bp-xprofile/bp-xprofile-notifications.php (2122 => 2123)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.1/bp-xprofile/bp-xprofile-notifications.php 2009-11-25 11:43:02 UTC (rev 2122)
+++ branches/1.1/bp-xprofile/bp-xprofile-notifications.php 2009-11-25 11:56:18 UTC (rev 2123)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> $ud = get_userdata( $user_id );
</span><span class="cx">
</span><span class="cx"> $wire_link = bp_core_get_user_domain( $user_id ) . 'wire';
</span><del>- $settings_link = bp_core_get_user_domain( $user_id ) . 'settings/notifications';
</del><ins>+ $settings_link = bp_core_get_user_domain( $user_id ) . $bp->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>
</div>
</body>
</html>