Changeset 1021 for trunk/bp-core/bp-core-settings.php

Timestamp:

02/06/2009 03:07:48 AM (17 years ago)

Author:

apeatling

Message:

Converted $bp as an array to $bp as an object. See this post for more info: http://buddypress.org/forums/topic.php?id=1125

File:

• trunk/bp-core/bp-core-settings.php (modified) (6 diffs)

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

@@ -7 +7 @@
         bp_core_add_nav_default( 'settings', 'bp_core_screen_general_settings', 'general', false );
         
-        bp_core_add_subnav_item( 'settings', 'general', __('General', 'buddypress'), $bp['loggedin_domain'] . 'settings/', 'bp_core_screen_general_settings', false, bp_is_home() );
-        bp_core_add_subnav_item( 'settings', 'notifications', __('Notifications', 'buddypress'), $bp['loggedin_domain'] . 'settings/', 'bp_core_screen_notification_settings', false, bp_is_home() );
-        bp_core_add_subnav_item( 'settings', 'delete-account', __('Delete Account', 'buddypress'), $bp['loggedin_domain'] . 'settings/', 'bp_core_screen_delete_account', false, bp_is_home() );
+        bp_core_add_subnav_item( 'settings', 'general', __('General', 'buddypress'), $bp->loggedin_user->domain . 'settings/', 'bp_core_screen_general_settings', false, bp_is_home() );
+        bp_core_add_subnav_item( 'settings', 'notifications', __('Notifications', 'buddypress'), $bp->loggedin_user->domain . 'settings/', 'bp_core_screen_notification_settings', false, bp_is_home() );
+        bp_core_add_subnav_item( 'settings', 'delete-account', __('Delete Account', 'buddypress'), $bp->loggedin_user->domain . 'settings/', 'bp_core_screen_delete_account', false, bp_is_home() );
 }
 add_action( 'wp', 'bp_core_add_settings_nav', 2 );
@@ -37 +37 @@
                                 $pass_error = true;
                         }
-                } else if ( $_POST['pass1'] == '' && $_POST['pass2'] != '' || $_POST['pass1'] != '' && $_POST['pass2'] == '' ) {
+                } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
                         $pass_error = true;
                 } else {
@@ -72 +72 @@
         <?php } ?>
 
-        <form action="<?php echo $bp['loggedin_domain'] . 'settings/general' ?>" method="post" id="settings-form">
+        <form action="<?php echo $bp->loggedin_user->domain . 'settings/general' ?>" method="post" id="settings-form">
                 <label for="email"><?php _e( 'Account Email', 'buddypress' ) ?></label>
                 <input type="text" name="email" id="email" value="<?php echo $current_user->user_email ?>" class="settings-input" />
@@ -122 +122 @@
         <?php } ?>
         
-        <form action="<?php echo $bp['loggedin_domain'] . 'settings/notifications' ?>" method="post" id="settings-form">
+        <form action="<?php echo $bp->loggedin_user->domain . 'settings/notifications' ?>" method="post" id="settings-form">
                 <h3><?php _e( 'Email Notifications', 'buddypress' ) ?></h3>
                 <p><?php _e( 'Send a notification by email when:', 'buddypress' ) ?></p>
@@ -165 +165 @@
                                 $pass_error = true;
                         }
-                } else if ( $_POST['pass1'] == '' && $_POST['pass2'] != '' || $_POST['pass1'] != '' && $_POST['pass2'] == '' ) {
+                } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
                         $pass_error = true;
                 } else {
@@ -188 +188 @@
         global $bp, $current_user, $bp_settings_updated, $pass_error;   ?>
 
-        <form action="<?php echo $bp['loggedin_domain'] . 'settings/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
+        <form action="<?php echo $bp->loggedin_user->domain . 'settings/delete-account'; ?>" name="account-delete-form" id="account-delete-form" class="standard-form" method="post">
                 
                 <div id="message" class="info">