Changeset 54270

Timestamp:

09/21/2022 01:07:52 AM (2 years ago)

Author:

peterwilsoncc

Message:

Themes: Relocate actions firing prior to and after template loading.

This relocates the actions wp_before_load_template and wp_after_load_template to fire within the load_template() function.

Prior to this change the actions fired in the locate_template() function.

Follow up to [53560].

Props johnjamesjacoby, johnbillion.
Fixes #54541.

File:

• trunk/src/wp-includes/template.php (modified) (3 diffs)

trunk/src/wp-includes/template.php

@@ -716 +716 @@
 
     if ( $load && '' !== $located ) {
-        /**
-         * Fires before a located template is loaded.
-         *
-         * @since 6.1.0
-         *
-         * @param string       $located        The template filename.
-         * @param string|array $template_names Template file(s) to search for, in order.
-         * @param bool         $require_once   Whether to require_once or require.
-         * @param array        $args           Additional arguments passed to the template.
-         */
-        do_action( 'wp_before_load_template', $located, $template_names, $require_once, $args );
-
         load_template( $located, $require_once, $args );
-
-        /**
-         * Fires after a located template is loaded.
-         *
-         * @since 6.1.0
-         *
-         * @param string       $located        The template filename.
-         * @param string|array $template_names Template file(s) to search for, in order.
-         * @param bool         $require_once   Whether to require_once or require.
-         * @param array        $args           Additional arguments passed to the template.
-         */
-        do_action( 'wp_after_load_template', $located, $template_names, $require_once, $args );
     }
 
@@ -793 +769 @@
     }
 
+    /**
+     * Fires before a template file is loaded.
+     *
+     * @since 6.1.0
+     *
+     * @param string $_template_file The full path to the template file.
+     * @param bool   $require_once   Whether to require_once or require.
+     * @param array  $args           Additional arguments passed to the template.
+     */
+    do_action( 'wp_before_load_template', $_template_file, $require_once, $args );
+
     if ( $require_once ) {
         require_once $_template_file;
@@ -798 +785 @@
         require $_template_file;
     }
-}
+
+    /**
+     * Fires after a template file is loaded.
+     *
+     * @since 6.1.0
+     *
+     * @param string $_template_file The full path to the template file.
+     * @param bool   $require_once   Whether to require_once or require.
+     * @param array  $args           Additional arguments passed to the template.
+     */
+    do_action( 'wp_after_load_template', $_template_file, $require_once, $args );
+}