Changeset 7543 for trunk/bp-notifications/bp-notifications-template.php

Timestamp:

11/09/2013 01:59:32 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Introduce bp-notifications-actions.php to handle single notification status toggling.

• Include new actions file in loader.
• Tweak link output functions to make it moderately easier to debug the URL.
• Introduce bp_notifications_mark_notification() to help with marking single notifications.
• Fix bp_notifications_delete_notification() to work with new array argument pattern, introduced previously.
• It's alive!

See #5148.

File:

• trunk/bp-notifications/bp-notifications-template.php (modified) (3 diffs)

trunk/bp-notifications/bp-notifications-template.php

@@ -661 +661 @@
     function bp_get_the_notification_mark_read_link() {
 
+        // Get the URL with nonce, action, and id
+        $url = wp_nonce_url( add_query_arg( array( 'action' => 'read', 'notification_id' => bp_get_the_notification_id() ), bp_get_notifications_unread_permalink() ), 'bp_notification_mark_read_' . bp_get_the_notification_id() );
+
+        // Start the output buffer
         ob_start(); ?>
 
-        <a href="<?php echo wp_nonce_url( add_query_arg( array( 'action' => 'read', 'id' => bp_get_the_notification_id() ), bp_get_notifications_unread_permalink() ), 'bp_notification_' . bp_get_the_notification_id() ); ?>" class="mark-read primary"><?php _e( 'Read', 'buddypress' ); ?></a>
+        <a href="<?php echo esc_url( $url ); ?>" class="mark-read primary"><?php _e( 'Read', 'buddypress' ); ?></a>
 
         <?php $retval = ob_get_clean();
@@ -687 +691 @@
     function bp_get_the_notification_mark_unread_link() {
 
+        // Get the URL with nonce, action, and id
+        $url = wp_nonce_url( add_query_arg( array( 'action' => 'unread', 'notification_id' => bp_get_the_notification_id() ), bp_get_notifications_read_permalink() ), 'bp_notification_mark_unread_' . bp_get_the_notification_id() );
+
+        // Start the output buffer
         ob_start(); ?>
 
-        <a href="<?php echo wp_nonce_url( add_query_arg( array( 'action' => 'unread', 'id' => bp_get_the_notification_id() ), bp_get_notifications_read_permalink() ), 'bp_notification_' . bp_get_the_notification_id() ); ?>" class="mark-unread primary"><?php _e( 'Unread', 'buddypress' ); ?></a>
+        <a href="<?php echo esc_url( $url ); ?>" class="mark-unread primary"><?php _e( 'Unread', 'buddypress' ); ?></a>
 
         <?php $retval = ob_get_clean();
@@ -746 +754 @@
         }
 
+        // Get the URL with nonce, action, and id
+        $url = wp_nonce_url( add_query_arg( array( 'action' => 'delete', 'notification_id' => bp_get_the_notification_id() ), $link ), 'bp_notification_delete_' . bp_get_the_notification_id() );
+
         // Start the output buffer
         ob_start(); ?>
 
-        <a href="<?php echo wp_nonce_url( add_query_arg( array( 'action' => 'delete', 'id' => bp_get_the_notification_id() ), $link ), 'bp_notification_' . bp_get_the_notification_id() ); ?>" class="delete secondary"><?php _e( 'Delete', 'buddypress' ); ?></a>
+        <a href="<?php echo esc_url( $url ); ?>" class="delete secondary"><?php _e( 'Delete', 'buddypress' ); ?></a>
 
         <?php $retval = ob_get_clean();