Changeset 13164 for trunk/src/bp-core/admin/bp-core-admin-functions.php

Timestamp:

12/10/2021 01:29:52 AM (4 years ago)

Author:

imath

Message:

Use an XHR request to dismiss the BP Add-ons screen welcome panel

This commit also improves oursrc/js folder to be able to generate Modern JavaScript files for BP Admin screens. It starts with removing the need to add a dependency to jQuery for the BP Add-ons screen and the WP-Admin extended profile screen.

Fixes #8148

File:

• trunk/src/bp-core/admin/bp-core-admin-functions.php (modified) (1 diff)

trunk/src/bp-core/admin/bp-core-admin-functions.php

@@ -1417 +1417 @@
     }
 
-    if ( empty( $_POST['nonce'] ) || empty( $_POST['notice_id'] ) ) {
+    $nonce_data = array();
+    if ( isset( $_SERVER['HTTP_X_BP_NONCE'] ) ) {
+        $nonce_data = array(
+            'nonce'  => $_SERVER['HTTP_X_BP_NONCE'],
+            'action' => 'bp_dismiss_admin_notice',
+        );
+    } elseif ( isset( $_POST['nonce'] ) ) {
+        $nonce_data['nonce'] = $_POST['nonce'];
+    }
+
+    if ( empty( $nonce_data['nonce'] ) || empty( $_POST['notice_id'] ) ) {
         wp_send_json_error();
     }
 
     $notice_id = wp_unslash( $_POST['notice_id'] );
-
-    if ( ! wp_verify_nonce( $_POST['nonce'], 'bp-dismissible-notice-' . $notice_id ) ) {
+    if ( ! isset( $nonce_data['action'] ) ) {
+        $nonce_data['action'] = 'bp-dismissible-notice-' . $notice_id;
+    }
+
+    if ( ! wp_verify_nonce( $nonce_data['nonce'], $nonce_data['action'] ) ) {
         wp_send_json_error();
     }
 
-    bp_update_option( "bp-dismissed-notice-$notice_id", 1 );
+    bp_update_option( "bp-dismissed-notice-{$notice_id}", true );
 
     wp_send_json_success();