Changeset 14075

Timestamp:

04/11/2010 05:26:03 PM (15 years ago)

Author:

nacin

Message:

Don't use require_once for get_template_part(). fixes #12958.

Location:

trunk/wp-includes

Files:

• general-template.php (modified) (2 diffs)
• theme.php (modified) (4 diffs)

trunk/wp-includes/general-template.php

@@ -104 +104 @@
  * then no template will be included.
  *
+ * The template is included using require, not require_once, so you may include the
+ * same template part multiple times.
+ *
  * For the parameter, if the file is called "{slug}-special.php" then specify
  * "special".
@@ -123 +126 @@
     $templates[] = "{$slug}.php";
 
-    locate_template($templates, true);
+    locate_template($templates, true, false);
 }
 

trunk/wp-includes/theme.php

@@ -987 +987 @@
  * @param array $template_names Array of template files to search for in priority 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.
  * @return string The template filename if one is located.
  */
-function locate_template($template_names, $load = false) {
+function locate_template($template_names, $load = false, $require_once = true ) {
     if ( !is_array($template_names) )
         return '';
@@ -1005 +1006 @@
 
     if ( $load && '' != $located )
-        load_template($located);
+        load_template( $located, $require_once );
 
     return $located;
@@ -1011 +1012 @@
 
 /**
- * Require once the template file with WordPress environment.
+ * Require the template file with WordPress environment.
  *
  * The globals are set up for the template file to ensure that the WordPress
@@ -1020 +1021 @@
  *
  * @param string $_template_file Path to template file.
- */
-function load_template($_template_file) {
+ * @param bool $require_once Whether to require_once or require. Default true.
+ */
+function load_template( $_template_file, $require_once = true ) {
     global $posts, $post, $wp_did_header, $wp_did_template_redirect, $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);
-
-    require_once($_template_file);
+    if ( is_array( $wp_query->query_vars ) )
+        extract( $wp_query->query_vars, EXTR_SKIP );
+
+    if ( $require_once )
+        require_once( $_template_file );
+    else
+        require( $_template_file );
 }