Changeset 3633 for trunk/bp-activity.php

Timestamp:

12/31/2010 06:05:34 PM (14 years ago)

Author:

djpaul

Message:

Cleanup code in notification settings, and don't reinvent the wheel. Fixes #2987, props wpmuguru

File:

• trunk/bp-activity.php (modified) (2 diffs)

trunk/bp-activity.php

@@ -203 +203 @@
 
 function bp_activity_screen_notification_settings() {
-    global $bp; 
-    
-    ?>
-    
+    global $bp;
+
+    $mention = get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true );
+    if ( !$mention )
+        $mention = 'yes';
+
+    $reply = get_user_meta( $bp->displayed_user->id, 'notification_activity_new_reply', true );
+    if ( !$reply )
+        $reply = 'yes';
+?>
     <table class="notification-settings zebra" id="activity-notification-settings">
         <thead>
@@ -221 +227 @@
                 <td></td>
                 <td><?php printf( __( 'A member mentions you in an update using "@%s"', 'buddypress' ), bp_core_get_username( $bp->displayed_user->id, $bp->displayed_user->userdata->user_nicename, $bp->displayed_user->userdata->user_login ) ) ?></td>
-                <td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php if ( !get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true ) ) { ?>checked="checked" <?php } ?>/></td>
-                <td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_activity_new_mention', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="yes"><input type="radio" name="notifications[notification_activity_new_mention]" value="yes" <?php checked( $mention, 'yes', true ) ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_activity_new_mention]" value="no" <?php checked( $mention, 'no', true ) ?>/></td>
             </tr>
             <tr id="activity-notification-settings-replies">
                 <td></td>
                 <td><?php _e( "A member replies to an update or comment you've posted", 'buddypress' ) ?></td>
-                <td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php if ( !get_user_meta( $bp->loggedin_user->id, 'notification_activity_new_reply', true ) || 'yes' == get_user_meta( $bp->displayed_user->id, 'notification_activity_new_reply', true ) ) { ?>checked="checked" <?php } ?>/></td>
-                <td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php if ( 'no' == get_user_meta( $bp->displayed_user->id, 'notification_activity_new_reply', true ) ) { ?>checked="checked" <?php } ?>/></td>
+                <td class="yes"><input type="radio" name="notifications[notification_activity_new_reply]" value="yes" <?php checked( $reply, 'yes', true ) ?>/></td>
+                <td class="no"><input type="radio" name="notifications[notification_activity_new_reply]" value="no" <?php checked( $reply, 'no', true ) ?>/></td>
             </tr>