Changeset 42343 for trunk/src/wp-includes/template.php

Timestamp:

11/30/2017 11:09:33 PM (7 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

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

trunk/src/wp-includes/template.php

@@ -24 +24 @@
     $type = preg_replace( '|[^a-z0-9-]+|', '', $type );
 
-    if ( empty( $templates ) )
-        $templates = array("{$type}.php");
+    if ( empty( $templates ) ) {
+        $templates = array( "{$type}.php" );
+    }
 
     /**
@@ -76 +77 @@
  */
 function get_index_template() {
-    return get_query_template('index');
+    return get_query_template( 'index' );
 }
 
@@ -92 +93 @@
  */
 function get_404_template() {
-    return get_query_template('404');
+    return get_query_template( '404' );
 }
 
@@ -113 +114 @@
 
     if ( count( $post_types ) == 1 ) {
-        $post_type = reset( $post_types );
+        $post_type   = reset( $post_types );
         $templates[] = "archive-{$post_type}.php";
     }
@@ -135 +136 @@
 function get_post_type_archive_template() {
     $post_type = get_query_var( 'post_type' );
-    if ( is_array( $post_type ) )
+    if ( is_array( $post_type ) ) {
         $post_type = reset( $post_type );
+    }
 
     $obj = get_post_type_object( $post_type );
@@ -336 +338 @@
  */
 function get_date_template() {
-    return get_query_template('date');
+    return get_query_template( 'date' );
 }
 
@@ -370 +372 @@
  */
 function get_front_page_template() {
-    $templates = array('front-page.php');
+    $templates = array( 'front-page.php' );
 
     return get_query_template( 'front_page', $templates );
@@ -404 +406 @@
  */
 function get_page_template() {
-    $id = get_queried_object_id();
+    $id       = get_queried_object_id();
     $template = get_page_template_slug();
-    $pagename = get_query_var('pagename');
+    $pagename = get_query_var( 'pagename' );
 
     if ( ! $pagename && $id ) {
         // If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
         $post = get_queried_object();
-        if ( $post )
+        if ( $post ) {
             $pagename = $post->post_name;
-    }
-
-    $templates = array();
-    if ( $template && 0 === validate_file( $template ) )
+        }
+    }
+
+    $templates = array();
+    if ( $template && 0 === validate_file( $template ) ) {
         $templates[] = $template;
+    }
     if ( $pagename ) {
         $pagename_decoded = urldecode( $pagename );
@@ -425 +429 @@
         $templates[] = "page-{$pagename}.php";
     }
-    if ( $id )
+    if ( $id ) {
         $templates[] = "page-{$id}.php";
+    }
     $templates[] = 'page.php';
 
@@ -445 +450 @@
  */
 function get_search_template() {
-    return get_query_template('search');
+    return get_query_template( 'search' );
 }
 
@@ -499 +504 @@
     }
 
-    $templates[] = "single.php";
+    $templates[] = 'single.php';
 
     return get_query_template( 'single', $templates );
@@ -541 +546 @@
     }
 
-    $templates[] = "embed.php";
+    $templates[] = 'embed.php';
 
     return get_query_template( 'embed', $templates );
@@ -627 +632 @@
  * @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 ) {
     $located = '';
     foreach ( (array) $template_names as $template_name ) {
-        if ( !$template_name )
+        if ( ! $template_name ) {
             continue;
-        if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
+        }
+        if ( file_exists( STYLESHEETPATH . '/' . $template_name ) ) {
             $located = STYLESHEETPATH . '/' . $template_name;
             break;
-        } elseif ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
+        } elseif ( file_exists( TEMPLATEPATH . '/' . $template_name ) ) {
             $located = TEMPLATEPATH . '/' . $template_name;
             break;
@@ -644 +650 @@
     }
 
-    if ( $load && '' != $located )
+    if ( $load && '' != $located ) {
         load_template( $located, $require_once );
+    }
 
     return $located;