Changeset 42349 for trunk

Timestamp:

12/01/2017 11:35:31 AM (7 years ago)

Author:

DrewAPicture

Message:

Hooks: Standardize naming of dynamic hooks using values derived from superglobals to use interpolation vs concatenation.

This is a continuation of the work that happened in [38307] for #37748.

Props ramiy.
Fixes #42698.

Location:

trunk/src/wp-admin

Files:

• admin-ajax.php (modified) (3 diffs)
• admin.php (modified) (1 diff)
• network/edit.php (modified) (2 diffs)
• network/sites.php (modified) (3 diffs)

trunk/src/wp-admin/admin-ajax.php

@@ -147 +147 @@
 add_action( 'wp_ajax_nopriv_heartbeat', 'wp_ajax_nopriv_heartbeat', 1 );
 
+$action = ( isset( $_REQUEST['action'] ) ) ? $_REQUEST['action'] : '';
+
 if ( is_user_logged_in() ) {
     // If no action is registered, return a Bad Request response.
-    if ( ! has_action( 'wp_ajax_' . $_REQUEST['action'] ) ) {
+    if ( ! has_action( "wp_ajax_{$action}" ) ) {
         wp_die( '0', 400 );
     }
@@ -156 +158 @@
      * Fires authenticated Ajax actions for logged-in users.
      *
-     * The dynamic portion of the hook name, `$_REQUEST['action']`,
-     * refers to the name of the Ajax action callback being fired.
+     * The dynamic portion of the hook name, `$action`, refers
+     * to the name of the Ajax action callback being fired.
      *
      * @since 2.1.0
      */
-    do_action( 'wp_ajax_' . $_REQUEST['action'] );
+    do_action( "wp_ajax_{$action}" );
 } else {
     // If no action is registered, return a Bad Request response.
-    if ( ! has_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] ) ) {
+    if ( ! has_action( "wp_ajax_nopriv_{$action}" ) ) {
         wp_die( '0', 400 );
     }
@@ -171 +173 @@
      * Fires non-authenticated Ajax actions for logged-out users.
      *
-     * The dynamic portion of the hook name, `$_REQUEST['action']`,
-     * refers to the name of the Ajax action callback being fired.
+     * The dynamic portion of the hook name, `$action`, refers
+     * to the name of the Ajax action callback being fired.
      *
      * @since 2.8.0
      */
-    do_action( 'wp_ajax_nopriv_' . $_REQUEST['action'] );
+    do_action( "wp_ajax_nopriv_{$action}" );
 }
 // Default status

trunk/src/wp-admin/admin.php

@@ -373 +373 @@
 
 if ( ! empty( $_REQUEST['action'] ) ) {
+    $action = $_REQUEST['action'];
+
     /**
      * Fires when an 'action' request variable is sent.
      *
-     * The dynamic portion of the hook name, `$_REQUEST['action']`,
-     * refers to the action derived from the `GET` or `POST` request.
+     * The dynamic portion of the hook name, `$action`, refers to
+     * the action derived from the `GET` or `POST` request.
      *
      * @since 2.6.0
      */
-    do_action( 'admin_action_' . $_REQUEST['action'] );
-}
+    do_action( "admin_action_{$action}" );
+}

trunk/src/wp-admin/network/edit.php

@@ -11 +11 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( empty( $_GET['action'] ) ) {
+$action = ( isset( $_GET['action'] ) ) ? $_GET['action'] : '';
+
+if ( empty( $action ) ) {
     wp_redirect( network_admin_url() );
     exit;
@@ -29 +31 @@
  * Fires the requested handler action.
  *
- * The dynamic portion of the hook name, `$_GET['action']`, refers to the name
- * of the requested action.
+ * The dynamic portion of the hook name, `$action`, refers to the name
+ * of the requested action derived from the `GET` request.
  *
  * @since 3.1.0
  */
-do_action( 'network_admin_edit_' . $_GET['action'] );
+do_action( "network_admin_edit_{$action}" );
 
 wp_redirect( network_admin_url() );

trunk/src/wp-admin/network/sites.php

@@ -279 +279 @@
 $msg = '';
 if ( isset( $_GET['updated'] ) ) {
-    switch ( $_GET['updated'] ) {
+    $action = $_GET['updated'];
+
+    switch ( $action ) {
         case 'all_notspam':
             $msg = __( 'Sites removed from spam.' );
@@ -315 +317 @@
         default:
             /**
-             * Filters a specific, non-default site-updated message in the Network admin.
-             *
-             * The dynamic portion of the hook name, `$_GET['updated']`, refers to the
-             * non-default site update action.
+             * Filters a specific, non-default, site-updated message in the Network admin.
+             *
+             * The dynamic portion of the hook name, `$action`, refers to the non-default
+             * site update action.
              *
              * @since 3.1.0
@@ -324 +326 @@
              * @param string $msg The update message. Default 'Settings saved'.
              */
-            $msg = apply_filters( 'network_sites_updated_message_' . $_GET['updated'], __( 'Settings saved.' ) );
+            $msg = apply_filters( "network_sites_updated_message_{$action}", __( 'Settings saved.' ) );
             break;
     }