Changeset 31365

Timestamp:

02/07/2015 07:44:13 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Remove unnecessary array_shift() usage in get_terms() for better performance.

props bswatson, VolodymyrC.
fixes #31182.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (1 diff)

trunk/src/wp-includes/taxonomy.php

@@ -2014 +2014 @@
         }
     }
-    reset( $terms );
 
     $_terms = array();
     if ( 'id=>parent' == $_fields ) {
-        while ( $term = array_shift( $terms ) ) {
-            $_terms[$term->term_id] = $term->parent;
+        foreach ( $terms as $term ) {
+            $_terms[ $term->term_id ] = $term->parent;
         }
     } elseif ( 'ids' == $_fields ) {
-        while ( $term = array_shift( $terms ) ) {
+        foreach ( $terms as $term ) {
             $_terms[] = $term->term_id;
         }
     } elseif ( 'names' == $_fields ) {
-        while ( $term = array_shift( $terms ) ) {
+        foreach ( $terms as $term ) {
             $_terms[] = $term->name;
         }
     } elseif ( 'id=>name' == $_fields ) {
-        while ( $term = array_shift( $terms ) ) {
-            $_terms[$term->term_id] = $term->name;
+        foreach ( $terms as $term ) {
+            $_terms[ $term->term_id ] = $term->name;
         }
     } elseif ( 'id=>slug' == $_fields ) {
-        while ( $term = array_shift( $terms ) ) {
-            $_terms[$term->term_id] = $term->slug;
+        foreach ( $terms as $term ) {
+            $_terms[ $term->term_id ] = $term->slug;
         }
     }