diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wp-includes/class-wp-query.php | 2 | ||||
| -rw-r--r-- | src/wp-includes/rewrite.php | 6 | ||||
| -rw-r--r-- | src/wp-includes/taxonomy.php | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/wp-includes/class-wp-query.php b/src/wp-includes/class-wp-query.php index 21127dc755..52121e2308 100644 --- a/src/wp-includes/class-wp-query.php +++ b/src/wp-includes/class-wp-query.php @@ -5005,7 +5005,7 @@ class WP_Query { * * These arrays are sorted in the query generator for the purposes of the * WHERE clause but the arguments are not modified as they can be used for - * the orderby clase. + * the orderby clause. * * Their use in the orderby clause will generate a different SQL query so * they can be sorted for the cache key generation. diff --git a/src/wp-includes/rewrite.php b/src/wp-includes/rewrite.php index 235c0c82e2..246846dc35 100644 --- a/src/wp-includes/rewrite.php +++ b/src/wp-includes/rewrite.php @@ -412,7 +412,7 @@ function wp_resolve_numeric_slug_conflicts( $query_vars = array() ) { // This is the potentially clashing slug. $value = ''; - if ( $compare && array_key_exists( $compare, $query_vars ) ) { + if ( array_key_exists( $compare, $query_vars ) ) { $value = $query_vars[ $compare ]; } @@ -460,9 +460,7 @@ function wp_resolve_numeric_slug_conflicts( $query_vars = array() ) { } // If we've gotten to this point, we have a slug/date clash. First, adjust for nextpage. - if ( '' !== $maybe_page ) { - $query_vars['page'] = (int) $maybe_page; - } + $query_vars['page'] = $maybe_page; // Next, unset autodetected date-related query vars. unset( $query_vars['year'] ); diff --git a/src/wp-includes/taxonomy.php b/src/wp-includes/taxonomy.php index 935212652c..70b407fda8 100644 --- a/src/wp-includes/taxonomy.php +++ b/src/wp-includes/taxonomy.php @@ -1337,7 +1337,7 @@ function get_terms( $args = array(), $deprecated = '' ) { $args['taxonomy'] = $taxonomies; } else { $args = wp_parse_args( $args, $defaults ); - if ( isset( $args['taxonomy'] ) && null !== $args['taxonomy'] ) { + if ( isset( $args['taxonomy'] ) ) { $args['taxonomy'] = (array) $args['taxonomy']; } } |