Changeset 31090 for trunk/src/wp-includes/date.php

Timestamp:

01/08/2015 07:04:40 AM (11 years ago)

Author:

wonderboymusic

Message:

The keyword elseif should be used instead of else if so that all control keywords look like single words.

This was a mess, is now standardized across the codebase, except for a few 3rd-party libs.

See #30799.

File:

• trunk/src/wp-includes/date.php (modified) (7 diffs)

trunk/src/wp-includes/date.php

@@ -426 +426 @@
             }
 
-        } else if ( $day_exists && $month_exists ) {
+        } elseif ( $day_exists && $month_exists ) {
             /*
              * 2. checking day, month combination
@@ -608 +608 @@
             if ( 'relation' === $key ) {
                 $relation = $query['relation'];
-            } else if ( is_array( $clause ) ) {
+            } elseif ( is_array( $clause ) ) {
 
                 // This is a first-order clause.
@@ -617 +617 @@
                     if ( ! $where_count ) {
                         $sql_chunks['where'][] = '';
-                    } else if ( 1 === $where_count ) {
+                    } elseif ( 1 === $where_count ) {
                         $sql_chunks['where'][] = $clause_sql['where'][0];
                     } else {
@@ -726 +726 @@
             $where_parts[] = "YEAR( $column ) $compare $value";
 
-        if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) )
+        if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) ) {
             $where_parts[] = "MONTH( $column ) $compare $value";
-        else if ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) )
+        } elseif ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) ) {
             $where_parts[] = "MONTH( $column ) $compare $value";
-
-        if ( isset( $query['week'] ) && false !== ( $value = $this->build_value( $compare, $query['week'] ) ) )
+        }
+        if ( isset( $query['week'] ) && false !== ( $value = $this->build_value( $compare, $query['week'] ) ) ) {
             $where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
-        else if ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) )
+        } elseif ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) ) {
             $where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
-
+        }
         if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )
             $where_parts[] = "DAYOFYEAR( $column ) $compare $value";
@@ -859 +859 @@
                 );
 
-            } else if ( preg_match( '/^(\d{4})\-(\d{2})$/', $datetime, $matches ) ) {
+            } elseif ( preg_match( '/^(\d{4})\-(\d{2})$/', $datetime, $matches ) ) {
                 // Y-m
                 $datetime = array(
@@ -866 +866 @@
                 );
 
-            } else if ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2})$/', $datetime, $matches ) ) {
+            } elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2})$/', $datetime, $matches ) ) {
                 // Y-m-d
                 $datetime = array(
@@ -874 +874 @@
                 );
 
-            } else if ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2})$/', $datetime, $matches ) ) {
+            } elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2})$/', $datetime, $matches ) ) {
                 // Y-m-d H:i
                 $datetime = array(