Ticket #13691: get_template_part.3.diff

general-template.php

@@ -19 +19 @@
  * @since 1.5.0
  * @uses do_action() Calls 'get_header' action.
  *
- * @param string $name The name of the specialised header.
+ * @param mixed $names The names of the specialised header templates (it can be a string, or an array of names to search for in priority order.).
  */
-function get_header( $name = null ) {
-        do_action( 'get_header', $name );
+function get_header( $names = array() ) {
+        do_action( 'get_header', $names );
 
-        $templates = array();
-        if ( isset($name) )
-                $templates[] = "header-{$name}.php";
-
-        $templates[] = "header.php";
-
         // Backward compat code will be removed in a future release
-        if ('' == locate_template($templates, true))
+        if ('' == get_template_part( 'header', $names ) )
                 load_template( WPINC . '/theme-compat/header.php');
 }
 
@@ -48 +42 @@
  * @since 1.5.0
  * @uses do_action() Calls 'get_footer' action.
  *
- * @param string $name The name of the specialised footer.
+ * @param mixed $names The names of the specialised footer templates (it can be a string, or an array of names to search for in priority order.).
  */
-function get_footer( $name = null ) {
-        do_action( 'get_footer', $name );
+function get_footer( $names = null ) {
+        do_action( 'get_footer', $names );
 
-        $templates = array();
-        if ( isset($name) )
-                $templates[] = "footer-{$name}.php";
-
-        $templates[] = "footer.php";
-
         // Backward compat code will be removed in a future release
-        if ('' == locate_template($templates, true))
+        if ('' == get_template_part( 'footer', $names ) )
                 load_template( WPINC . '/theme-compat/footer.php');
 }
 
@@ -77 +65 @@
  * @since 1.5.0
  * @uses do_action() Calls 'get_sidebar' action.
  *
- * @param string $name The name of the specialised sidebar.
+ * @param mixed $names The names of the specialised sidebar templates (it can be a string, or an array of names to search for in priority order.). 
  */
-function get_sidebar( $name = null ) {
-        do_action( 'get_sidebar', $name );
+function get_sidebar( $names = array() ) {
+        do_action( 'get_sidebar', $names );
 
-        $templates = array();
-        if ( isset($name) )
-                $templates[] = "sidebar-{$name}.php";
-
-        $templates[] = "sidebar.php";
-
         // Backward compat code will be removed in a future release
-        if ('' == locate_template($templates, true))
+        if ('' == get_template_part( 'sidebar', $names ) )
                 load_template( WPINC . '/theme-compat/sidebar.php');
 }
 
@@ -111 +93 @@
  *
  * @uses locate_template()
  * @since 3.0.0
- * @uses do_action() Calls 'get_template_part{$slug}' action.
+ * @uses do_action() Calls 'get_template_part_{$slug}' action.
  *
  * @param string $slug The slug name for the generic template.
- * @param string $name The name of the specialised template.
+ * @param mixed $names The names of the specialised templates (it can be a string, or an array of names to search for in priority order.).
  */
-function get_template_part( $slug, $name = null ) {
-        do_action( "get_template_part_{$slug}", $slug, $name );
-
+function get_template_part( $slug, $names = array() ) {
+        do_action( "get_template_part_{$slug}", $slug, $names );
+        
         $templates = array();
-        if ( isset($name) )
+        foreach ( (array)$names as $name ) {
                 $templates[] = "{$slug}-{$name}.php";
-
+        }
         $templates[] = "{$slug}.php";
 
-        locate_template($templates, true, false);
+        return locate_template($templates, true, false);
 }
 
 /**