Ticket #21676: 21676.2.patch

trunk/wp-includes/template.php

@@ -346 +346 @@
  * @param string|array $template_names Template file(s) to search for, in order.
  * @param bool $load If true the template file will be loaded if it is found.
  * @param bool $require_once Whether to require_once or require. Default true. Has no effect if $load is false.
+ * @param mixed $data An array of arguments to be extracted into current scope in load_template.
  * @return string The template filename if one is located.
  */
-function locate_template($template_names, $load = false, $require_once = true ) {
+function locate_template($template_names, $load = false, $require_once = true, $data = array()) {
         $located = '';
         foreach ( (array) $template_names as $template_name ) {
                 if ( !$template_name )
@@ -363 +364 @@
         }
 
         if ( $load && '' != $located )
-                load_template( $located, $require_once );
+                load_template( $located, $require_once, $data );
 
         return $located;
 }
@@ -379 +380 @@
  *
  * @param string $_template_file Path to template file.
  * @param bool $require_once Whether to require_once or require. Default true.
+ * @param array $_data An array of arguments to be extracted into current scope.
  */
-function load_template( $_template_file, $require_once = true ) {
+function load_template( $_template_file, $require_once = true, $_data = array() ) {
         global $posts, $post, $wp_did_header, $wp_query, $wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment, $user_ID;
 
         if ( is_array( $wp_query->query_vars ) )
                 extract( $wp_query->query_vars, EXTR_SKIP );
+
+        extract( $_data, EXTR_SKIP );
 
         if ( $require_once )
                 require_once( $_template_file );

trunk/wp-includes/general-template.php

@@ -115 +115 @@
  *
  * @param string $slug The slug name for the generic template.
  * @param string $name The name of the specialised template.
+ * @param mixed $data An array of arguments to be extracted into current scope in load_template.
  */
-function get_template_part( $slug, $name = null ) {
-        do_action( "get_template_part_{$slug}", $slug, $name );
+function get_template_part( $slug, $name = null, $data = array() ) {
+        do_action( "get_template_part_{$slug}", $slug, $name, $data );
 
         $templates = array();
         if ( isset($name) )
@@ -125 +126 @@
 
         $templates[] = "{$slug}.php";
 
-        locate_template($templates, true, false);
+        locate_template($templates, true, false, $data);
 }
 
 /**