Skip to:
Content

BuddyPress.org

Changeset 2123


Ignore:
Timestamp:
11/25/2009 11:56:18 AM (17 years ago)
Author:
johnjamesjacoby
Message:

Fixes #1249

Location:
branches/1.1
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/1.1/bp-core/bp-core-settings.php

    r2076 r2123  
    1717        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' ) );
    1818
    19         $settings_link = $bp->loggedin_user->domain . 'settings/';
     19        $settings_link = $bp->loggedin_user->domain . BP_SETTINGS_SLUG . '/';
    2020
    2121        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() ) );
    … …  
    8686        <?php } ?>
    8787
    88         <form action="<?php echo $bp->loggedin_user->domain . 'settings/general' ?>" method="post" class="standard-form" id="settings-form">
     88        <form action="<?php echo $bp->loggedin_user->domain . $bp->settings->slug . '/general' ?>" method="post" class="standard-form" id="settings-form">
    8989                <label for="email"><?php _e( 'Account Email', 'buddypress' ) ?></label>
    9090                <input type="text" name="email" id="email" value="<?php echo attribute_escape( $current_user->user_email ); ?>" class="settings-input" />
    … …  
    138138        <?php } ?>
    139139
    140         <form action="<?php echo $bp->loggedin_user->domain . 'settings/notifications' ?>" method="post" id="settings-form">
     140        <form action="<?php echo $bp->loggedin_user->domain . $bp->settings->slug . '/notifications' ?>" method="post" id="settings-form">
    141141                <h3><?php _e( 'Email Notifications', 'buddypress' ) ?></h3>
    142142                <p><?php _e( 'Send a notification by email when:', 'buddypress' ) ?></p>
    … …  
    176176        global $bp, $current_user, $bp_settings_updated, $pass_error;   ?>
    177177
    178         <form action="<?php echo $bp->loggedin_user->domain . 'settings/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
     178        <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">
    179179
    180180                <div id="message" class="info">

  • branches/1.1/bp-friends/bp-friends-notifications.php

    r2076 r2123  
    1313
    1414        $all_requests_link = bp_core_get_user_domain( $friend_id ) . 'friends/requests/';
    15         $settings_link = bp_core_get_user_domain( $friend_id ) . 'settings/notifications';
     15        $settings_link = bp_core_get_user_domain( $friend_id ) . $bp->settings->slug . '/notifications';
    1616
    1717        $initiator_link = bp_core_get_user_domain( $initiator_id );
    … …  
    5151
    5252        $friend_link = bp_core_get_user_domain( $friend_id );
    53         $settings_link = bp_core_get_user_domain( $initiator_id ) . 'settings/notifications';
     53        $settings_link = bp_core_get_user_domain( $initiator_id ) . $bp->settings->slug . '/notifications';
    5454
    5555        // Set up and send the message

  • branches/1.1/bp-groups/bp-groups-notifications.php

    r2116 r2123  
    2525                $wire_link = site_url( $bp->groups->slug . '/' . $group->slug . '/wire/' );
    2626                $group_link = site_url( $bp->groups->slug . '/' . $group->slug . '/' );
    27                 $settings_link = bp_core_get_user_domain( $user->user_id ) . 'settings/notifications/';
     27                $settings_link = bp_core_get_user_domain( $user->user_id ) . $bp->settings->slug . '/notifications/';
    2828
    2929                $message = sprintf( __(
    … …  
    6565
    6666                $group_link = site_url( $bp->groups->slug . '/' . $group->slug );
    67                 $settings_link = bp_core_get_user_domain( $user->user_id ) . 'settings/notifications/';
     67                $settings_link = bp_core_get_user_domain( $user->user_id ) . $bp->settings->slug . '/notifications/';
    6868
    6969                $message = sprintf( __(
    … …  
    100100        $group_requests = bp_get_group_permalink( $group ) . '/admin/membership-requests';
    101101        $profile_link = bp_core_get_user_domain( $requesting_user_id );
    102         $settings_link = bp_core_get_user_domain( $requesting_user_id ) . 'settings/notifications/';
     102        $settings_link = bp_core_get_user_domain( $requesting_user_id ) . $bp->settings->slug . '/notifications/';
    103103
    104104        // Set up and send the message
    … …  
    142142
    143143        $group_link = bp_get_group_permalink( $group );
    144         $settings_link = bp_core_get_user_domain( $requesting_user_id ) . 'settings/notifications/';
     144        $settings_link = bp_core_get_user_domain( $requesting_user_id ) . $bp->settings->slug . '/notifications/';
    145145
    146146        // Set up and send the message
    … …  
    195195
    196196        $group_link = bp_get_group_permalink( $group );
    197         $settings_link = bp_core_get_user_domain( $user_id ) . 'settings/notifications/';
     197        $settings_link = bp_core_get_user_domain( $user_id ) . $bp->settings->slug . '/notifications/';
    198198
    199199        // Set up and send the message
    … …  
    237237                $invited_ud = get_userdata($invited_user_id);
    238238
    239                 $settings_link = bp_core_get_user_domain( $invited_user_id ) . 'settings/notifications/';
     239                $settings_link = bp_core_get_user_domain( $invited_user_id ) . $bp->settings->slug . '/notifications/';
    240240                $invited_link = bp_core_get_user_domain( $invited_user_id );
    241241                $invites_link = $invited_link . $bp->groups->slug . '/invites';

  • branches/1.1/bp-messages/bp-messages-notifications.php

    r2076 r2123  
    1313
    1414                $ud = get_userdata( $recipient_ids[$i] );
    15                 $message_link = bp_core_get_user_domain( $recipient_ids[$i] ) . 'messages/view/' . $message->id;
    16                 $settings_link = bp_core_get_user_domain( $recipient_ids[$i] ) . 'settings/notifications';
     15                $message_link = bp_core_get_user_domain( $recipient_ids[$i] ) . $bp->messages->slug . '/view/' . $message->id;
     16                $settings_link = bp_core_get_user_domain( $recipient_ids[$i] ) . $bp->settings->slug . '/notifications';
    1717
    1818                // Set up and send the message
    … …  
    4949                if ( get_usermeta( $users[$i]->user_id, 'notification_messages_new_notice' ) == 'no' ) continue;
    5050
    51                 $message_link = bp_core_get_user_domain( $users[$i]->user_id ) . 'messages';
    52                 $settings_link = bp_core_get_user_domain( $users[$i]->user_id ) . 'settings/notifications';
     51                $message_link = bp_core_get_user_domain( $users[$i]->user_id ) . $bp->messages->slug;
     52                $settings_link = bp_core_get_user_domain( $users[$i]->user_id ) . $bp->settings->slug . '/notifications';
    5353
    5454                // Set up and send the message

  • branches/1.1/bp-xprofile/bp-xprofile-notifications.php

    r2076 r2123  
    3131
    3232                        $wire_link = bp_core_get_user_domain( $user_id ) . 'wire';
    33                         $settings_link = bp_core_get_user_domain( $user_id ) . 'settings/notifications';
     33                        $settings_link = bp_core_get_user_domain( $user_id ) . $bp->settings->slug . '/notifications';
    3434
    3535                        // Set up and send the message
Note: See TracChangeset for help on using the changeset viewer.