Ticket #12371: generalize_template_logic.12371.diff

wp-includes/general-template.php

@@ -94 +94 @@
 }
 
 /**
- * Load a generic template.
+ * Load a specific template.
  *
  * Includes the named template for a theme or if a name is specified then a
  * specialised template will be included. If the theme contains no {slug}.php file
@@ -105 +105 @@
  *
  * @uses locate_template()
  * @since 3.0.0
- * @uses do_action() Calls 'get_generic_template_{$slug}' action.
+ * @uses do_action() Calls 'get_specific_template_{$slug}' action.
  *
  * @param string $slug The slug name for the generic template.
  * @param string $name The name of the specialised template.
  */
-function get_generic_template( $slug, $name = null ) {
-        do_action( "get_generic_template_{$slug}", $name );
+function get_specific_template( $slug, $name = null ) {
+        do_action( "get_specific_template_{$slug}", $name );
 
         $templates = array();
         if ( isset($name) )

wp-content/themes/twentyten/author.php

@@ -21 +21 @@
 
 <?php rewind_posts(); ?>
 
-<?php get_generic_template( 'loop', 'author' ); ?>
+<?php get_specific_template( 'loop', 'author' ); ?>
 
                         </div><!-- #content -->
                 </div><!-- #container -->

wp-content/themes/twentyten/search.php

@@ -5 +5 @@
 
 <?php if ( have_posts() ) : ?>
                                 <h1 class="page-title"><?php _e( 'Search Results for: ', 'twentyten' ); ?><span><?php the_search_query(); ?></span></h1>
-        <?php get_generic_template( 'loop', 'search' ); ?>
+        <?php get_specific_template( 'loop', 'search' ); ?>
 <?php else : ?>
                                 <div id="post-0" class="post no-results not-found">
                                         <h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ); ?></h2>

wp-content/themes/twentyten/index.php

@@ -4 +4 @@
                         <div id="content">
 
     <?php if ( have_posts() ) : 
-                get_generic_template( 'loop', 'index' );
+                get_specific_template( 'loop', 'index' );
     else : ?>
                 <h2><?php _e( 'Not Found', 'twentyten' ); ?></h2>
                 <div class="entry-content">

wp-content/themes/twentyten/tag.php

@@ -9 +9 @@
 
 <?php rewind_posts(); ?>
 
-<?php get_generic_template( 'loop', 'tag' ); ?>
+<?php get_specific_template( 'loop', 'tag' ); ?>
 
                         </div><!-- #content -->
                 </div><!-- #container -->

wp-content/themes/twentyten/category.php

@@ -6 +6 @@
                                 <h1 class="page-title"><?php _e( 'Category Archives:', 'twentyten' ); ?> <span><?php single_cat_title(); ?></span></span></h1>
                                 <?php $categorydesc = category_description(); if ( !empty($categorydesc) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
 
-<?php get_generic_template( 'loop', 'category' ); ?>
+<?php get_specific_template( 'loop', 'category' ); ?>
 
                         </div><!-- #content -->
                 </div><!-- #container -->

wp-content/themes/twentyten/archive.php

@@ -17 +17 @@
 
 <?php rewind_posts(); ?>
 
-<?php get_generic_template( 'loop', 'archive' ); ?>
+<?php get_specific_template( 'loop', 'archive' ); ?>
 
                         </div><!-- #content -->
                 </div><!-- #container -->