Skip to:
Content

BuddyPress.org

Changeset 2717


Ignore:
Timestamp:
02/15/2010 07:04:18 AM (17 years ago)
Author:
johnjamesjacoby
Message:

Replace hard coded 'settings' in URI's with BP_SETTINGS_SLUG

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-activity/bp-activity-notifications.php

    r2697 r2717  
    2121
    2222                        $message_link = bp_activity_get_permalink( $activity_id );
    23                         $settings_link = bp_core_get_user_domain( $receiver_user_id ) . 'settings/notifications/';
     23                        $settings_link = bp_core_get_user_domain( $receiver_user_id ) .  BP_SETTINGS_SLUG . '/notifications/';
    2424
    2525                        // Set up and send the message
    … …  
    6161                $poster_name = bp_core_get_user_displayname( $commenter_id );
    6262                $thread_link = bp_activity_get_permalink( $activity_id );
    63                 $settings_link = bp_core_get_user_domain( $original_activity->user_id ) . 'settings/notifications/';
     63                $settings_link = bp_core_get_user_domain( $original_activity->user_id ) .  BP_SETTINGS_SLUG . '/notifications/';
    6464
    6565                // Set up and send the message
    … …  
    100100                $poster_name = bp_core_get_user_displayname( $commenter_id );
    101101                $thread_link = bp_activity_get_permalink( $activity_id );
    102                 $settings_link = bp_core_get_user_domain( $parent_comment->user_id ) . 'settings/notifications/';
     102                $settings_link = bp_core_get_user_domain( $parent_comment->user_id ) .  BP_SETTINGS_SLUG . '/notifications/';
    103103
    104104                // Set up and send the message

  • trunk/bp-core/bp-core-settings.php

    r2695 r2717  
    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_my_profile() ) );
    … …  
    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" />
    … …  
    141141        <?php } ?>
    142142
    143         <form action="<?php echo $bp->loggedin_user->domain . 'settings/notifications' ?>" method="post" id="settings-form">
     143        <form action="<?php echo $bp->loggedin_user->domain . BP_SETTINGS_SLUG . '/notifications' ?>" method="post" id="settings-form">
    144144                <h3><?php _e( 'Email Notifications', 'buddypress' ) ?></h3>
    145145                <p><?php _e( 'Send a notification by email when:', 'buddypress' ) ?></p>
    … …  
    181181        global $bp, $current_user, $bp_settings_updated, $pass_error;   ?>
    182182
    183         <form action="<?php echo $bp->loggedin_user->domain . 'settings/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
     183        <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">
    184184
    185185                <div id="message" class="info">

  • trunk/bp-friends/bp-friends-notifications.php

    r2697 r2717  
    1313
    1414        $all_requests_link = bp_core_get_user_domain( $friend_id ) . BP_FRIENDS_SLUG . '/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 );
    … …  
    5454
    5555        $friend_link = bp_core_get_user_domain( $friend_id );
    56         $settings_link = bp_core_get_user_domain( $initiator_id ) . 'settings/notifications';
     56        $settings_link = bp_core_get_user_domain( $initiator_id ) .  BP_SETTINGS_SLUG . '/notifications';
    5757
    5858        // Set up and send the message

  • trunk/bp-groups/bp-groups-notifications.php

    r2697 r2717  
    1717
    1818                $group_link = site_url( $bp->groups->slug . '/' . $group->slug );
    19                 $settings_link = bp_core_get_user_domain( $user_id ) . 'settings/notifications/';
     19                $settings_link = bp_core_get_user_domain( $user_id ) .  BP_SETTINGS_SLUG . '/notifications/';
    2020
    2121                $message = sprintf( __(
    … …  
    5656        $group_requests = bp_get_group_permalink( $group ) . 'admin/membership-requests';
    5757        $profile_link = bp_core_get_user_domain( $requesting_user_id );
    58         $settings_link = bp_core_get_user_domain( $requesting_user_id ) . 'settings/notifications/';
     58        $settings_link = bp_core_get_user_domain( $requesting_user_id ) .  BP_SETTINGS_SLUG . '/notifications/';
    5959
    6060        // Set up and send the message
    … …  
    102102
    103103        $group_link = bp_get_group_permalink( $group );
    104         $settings_link = bp_core_get_user_domain( $requesting_user_id ) . 'settings/notifications/';
     104        $settings_link = bp_core_get_user_domain( $requesting_user_id ) .  BP_SETTINGS_SLUG . '/notifications/';
    105105
    106106        // Set up and send the message
    … …  
    159159
    160160        $group_link = bp_get_group_permalink( $group );
    161         $settings_link = bp_core_get_user_domain( $user_id ) . 'settings/notifications/';
     161        $settings_link = bp_core_get_user_domain( $user_id ) .  BP_SETTINGS_SLUG . '/notifications/';
    162162
    163163        // Set up and send the message
    … …  
    205205                $invited_ud = bp_core_get_core_userdata($invited_user_id);
    206206
    207                 $settings_link = bp_core_get_user_domain( $invited_user_id ) . 'settings/notifications/';
     207                $settings_link = bp_core_get_user_domain( $invited_user_id ) .  BP_SETTINGS_SLUG . '/notifications/';
    208208                $invited_link = bp_core_get_user_domain( $invited_user_id );
    209209                $invites_link = $invited_link . $bp->groups->slug . '/invites';
    … …  
    263263
    264264                        $message_link = bp_activity_get_permalink( $activity_id );
    265                         $settings_link = bp_core_get_user_domain( $receiver_user_id ) . 'settings/notifications/';
     265                        $settings_link = bp_core_get_user_domain( $receiver_user_id ) .  BP_SETTINGS_SLUG . '/notifications/';
    266266
    267267                        // Set up and send the message

  • trunk/bp-messages/bp-messages-notifications.php

    r2697 r2717  
    1212                $ud = get_userdata( $recipient->user_id );
    1313                $message_link = bp_core_get_user_domain( $recipient->user_id ) . BP_MESSAGES_SLUG .'/';
    14                 $settings_link = bp_core_get_user_domain( $recipient->user_id ) . 'settings/notifications/';
     14                $settings_link = bp_core_get_user_domain( $recipient->user_id ) .  BP_SETTINGS_SLUG . '/notifications/';
    1515
    1616                // Set up and send the message
Note: See TracChangeset for help on using the changeset viewer.