Changeset 31829

Timestamp:

03/19/2015 03:55:39 AM (10 years ago)

Author:

wonderboymusic

Message:

Replace array_shift() with reset() where appropriate for performance.

Props SergeyBiryukov.
Fixes #31259.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (2 diffs)
• wp-admin/includes/menu.php (modified) (2 diffs)
• wp-admin/includes/ms.php (modified) (1 diff)
• wp-admin/includes/plugin-install.php (modified) (2 diffs)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-admin/widgets.php (modified) (1 diff)
• wp-includes/pomo/streams.php (modified) (1 diff)
• wp-includes/post-formats.php (modified) (1 diff)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/query.php (modified) (1 diff)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -1092 +1092 @@
 
             $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) );
-            $_menu_item = array_shift( $_menu_items );
+            $_menu_item = reset( $_menu_items );
 
             // Restore the missing menu item properties
@@ -1794 +1794 @@
             wp_die( $error );
 
-        $_POST['widget-' . $id_base] = array( $multi_number => array_shift($settings) );
+        $_POST[ 'widget-' . $id_base ] = array( $multi_number => reset( $settings ) );
         $widget_id = $id_base . '-' . $multi_number;
         $sidebar[] = $widget_id;

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -1905 +1905 @@
             case 'plugin':
                 $plugin_data = get_plugins( '/' . $update->slug );
-                $plugin_data = array_shift( $plugin_data );
+                $plugin_data = reset( $plugin_data );
                 if ( $plugin_data )
                     return $plugin_data['Name'];

trunk/src/wp-admin/includes/media.php

@@ -622 +622 @@
 
     if ( isset($_POST['send']) ) {
-        $keys = array_keys($_POST['send']);
-        $send_id = (int) array_shift($keys);
+        $keys = array_keys( $_POST['send'] );
+        $send_id = (int) reset( $keys );
     }
 
@@ -1358 +1358 @@
     $post_mime_types = get_post_mime_types();
     $keys = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) );
-    $type = array_shift( $keys );
+    $type = reset( $keys );
     $type_html = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
 

trunk/src/wp-admin/includes/menu.php

@@ -95 +95 @@
         continue;
     $subs = $submenu[$data[2]];
-    $first_sub = array_shift($subs);
+    $first_sub = reset( $subs );
     $old_parent = $data[2];
     $new_parent = $first_sub[2];
@@ -164 +164 @@
     if ( ! empty( $submenu[$data[2]] ) && 1 == count ( $submenu[$data[2]] ) ) {
         $subs = $submenu[$data[2]];
-        $first_sub = array_shift($subs);
+        $first_sub = reset( $subs );
         if ( $data[2] == $first_sub[2] )
             unset( $submenu[$data[2]] );

trunk/src/wp-admin/includes/ms.php

@@ -805 +805 @@
             <?php
             if ( !$found ) {
-                $blog = array_shift( $all_blogs );
+                $blog = reset( $all_blogs );
                 update_user_meta( get_current_user_id(), 'primary_blog', $blog->userblog_id );
             }
         } elseif ( count( $all_blogs ) == 1 ) {
-            $blog = array_shift( $all_blogs );
+            $blog = reset( $all_blogs );
             echo $blog->domain;
             if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.

trunk/src/wp-admin/includes/plugin-install.php

@@ -305 +305 @@
             } else {
                 $key = array_keys( $installed_plugin );
-                $key = array_shift( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
+                $key = reset( $key ); //Use the first plugin regardless of the name, Could have issues for multiple-plugins in one directory if they share different version numbers
                 $update_file = $api->slug . '/' . $key;
                 if ( version_compare($api->version, $installed_plugin[ $key ]['Version'], '=') ){
@@ -392 +392 @@
     if ( empty( $section ) || ! isset( $api->sections[ $section ] ) ) {
         $section_titles = array_keys( (array) $api->sections );
-        $section = array_shift( $section_titles );
+        $section = reset( $section_titles );
     }
 

trunk/src/wp-admin/user-edit.php

@@ -316 +316 @@
 // Compare user role against currently editable roles
 $user_roles = array_intersect( array_values( $profileuser->roles ), array_keys( get_editable_roles() ) );
-$user_role  = array_shift( $user_roles );
+$user_role  = reset( $user_roles );
 
 // print the full list of roles with the primary one selected.

trunk/src/wp-admin/widgets.php

@@ -190 +190 @@
         // Default to the first sidebar
         $keys = array_keys( $wp_registered_sidebars );
-        $sidebar = array_shift( $keys );
+        $sidebar = reset( $keys );
 
         if ( isset($_GET['base']) && isset($_GET['num']) ) { // multi-widget

trunk/src/wp-includes/pomo/streams.php

@@ -41 +41 @@
         $endian_letter = ('big' == $this->endian)? 'N' : 'V';
         $int = unpack($endian_letter, $bytes);
-        return array_shift($int);
+        return reset( $int );
     }
 

trunk/src/wp-includes/post-formats.php

@@ -27 +27 @@
         return false;
 
-    $format = array_shift( $_format );
+    $format = reset( $_format );
 
     return str_replace('post-format-', '', $format->slug );

trunk/src/wp-includes/post.php

@@ -4600 +4600 @@
 
     if ( 1 == count( $post_status ) ) {
-        $where_post_type = $wpdb->prepare( "post_type = %s AND post_status = %s", $r['post_type'], array_shift( $post_status ) );
+        $where_post_type = $wpdb->prepare( "post_type = %s AND post_status = %s", $r['post_type'], reset( $post_status ) );
     } else {
         $post_status = implode( "', '", $post_status );

trunk/src/wp-includes/query.php

@@ -4674 +4674 @@
             if ( count( $post_type ) > 1 )
                 return;
-            $post_type = array_shift( $post_type );
+            $post_type = reset( $post_type );
         }