Changeset 30982

Timestamp:

12/20/2014 10:46:53 PM (10 years ago)

Author:

wonderboymusic

Message:

For clarity, initialize some arrays that previously were only assigned via short circuit in loops.

See #30799.

Location:

trunk/src

Files:

• wp-admin/includes/nav-menu.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-admin/includes/theme.php (modified) (2 diffs)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (2 diffs)
• wp-includes/default-widgets.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (2 diffs)
• wp-includes/general-template.php (modified) (3 diffs)
• wp-includes/media.php (modified) (1 diff)
• wp-includes/ms-deprecated.php (modified) (1 diff)
• wp-includes/ms-load.php (modified) (1 diff)
• wp-includes/post.php (modified) (5 diffs)
• wp-includes/rewrite.php (modified) (2 diffs)
• wp-includes/taxonomy.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)

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

@@ -1253 +1253 @@
 function wp_nav_menu_update_menu_items ( $nav_menu_selected_id, $nav_menu_selected_title ) {
     $unsorted_menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'orderby' => 'ID', 'output' => ARRAY_A, 'output_key' => 'ID', 'post_status' => 'draft,publish' ) );
-
+    $messages = array();
     $menu_items = array();
     // Index menu items by db ID

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

@@ -302 +302 @@
     $default = 1;
 
+    $checked_categories = array();
+
     if ( $link_id ) {
         $checked_categories = wp_get_link_cats( $link_id );
         // No selected categories, strange
-        if ( ! count( $checked_categories ) )
+        if ( ! count( $checked_categories ) ) {
             $checked_categories[] = $default;
+        }
     } else {
         $checked_categories[] = $default;

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

@@ -431 +431 @@
 
     WP_Theme::sort_by_name( $themes );
+
+    $parents = array();
+
     foreach ( $themes as $theme ) {
         $slug = $theme->get_stylesheet();
@@ -470 +473 @@
 
     // Remove 'delete' action if theme has an active child
-    if ( isset( $parents ) && array_key_exists( $current_theme, $parents ) ) {
+    if ( ! empty( $parents ) && array_key_exists( $current_theme, $parents ) ) {
         unset( $prepared_themes[ $parents[ $current_theme ] ]['actions']['delete'] );
     }

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

@@ -1787 +1787 @@
         if ($tableindices) {
             // Clear the index array.
-            unset($index_ary);
+            $index_ary = array();
 
             // For every index in the table.

trunk/src/wp-includes/category-template.php

@@ -1290 +1290 @@
         return false;
 
+    $links = array();
+
     foreach ( $terms as $term ) {
         $link = get_term_link( $term, $taxonomy );
-        if ( is_wp_error( $link ) )
+        if ( is_wp_error( $link ) ) {
             return $link;
-        $term_links[] = '<a href="' . esc_url( $link ) . '" rel="tag">' . $term->name . '</a>';
+        }
+        $links[] = '<a href="' . esc_url( $link ) . '" rel="tag">' . $term->name . '</a>';
     }
 
@@ -1305 +1308 @@
      * @since 2.5.0
      *
-     * @param array $term_links An array of term links.
-     */
-    $term_links = apply_filters( "term_links-$taxonomy", $term_links );
+     * @param array $links An array of term links.
+     */
+    $term_links = apply_filters( "term_links-$taxonomy", $links );
 
     return $before . join( $sep, $term_links ) . $after;

trunk/src/wp-includes/default-widgets.php

@@ -1267 +1267 @@
 
     public function update( $new_instance, $old_instance ) {
+        $instance = array();
         $instance['title'] = strip_tags(stripslashes($new_instance['title']));
         $instance['taxonomy'] = stripslashes($new_instance['taxonomy']);

trunk/src/wp-includes/formatting.php

@@ -1023 +1023 @@
         $string = strtr($string, $chars);
     } else {
+        $chars = array();
         // Assume ISO-8859-1 if not UTF-8
         $chars['in'] = chr(128).chr(131).chr(138).chr(142).chr(154).chr(158)
@@ -1038 +1039 @@
 
         $string = strtr($string, $chars['in'], $chars['out']);
+        $double_chars = array();
         $double_chars['in'] = array(chr(140), chr(156), chr(198), chr(208), chr(222), chr(223), chr(230), chr(240), chr(254));
         $double_chars['out'] = array('OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th');

trunk/src/wp-includes/general-template.php

@@ -1439 +1439 @@
         if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
             $results = $wpdb->get_results( $query );
-            $cache[ $key ] = $results;
             wp_cache_set( $key, $results, 'posts' );
         }
@@ -1658 +1657 @@
     <tr>';
 
+    $daywithpost = array();
+
     // Get days with posts
     $dayswithposts = $wpdb->get_results("SELECT DISTINCT DAYOFMONTH(post_date)
@@ -1667 +1668 @@
             $daywithpost[] = $daywith[0];
         }
-    } else {
-        $daywithpost = array();
     }
 

trunk/src/wp-includes/media.php

@@ -587 +587 @@
     // get the best one for a specified set of dimensions
     if ( is_array($size) && !empty($imagedata['sizes']) ) {
+        $areas = array();
+
         foreach ( $imagedata['sizes'] as $_size => $data ) {
             // already cropped to width or height; so use this size

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

@@ -167 +167 @@
     $blogs = $wpdb->get_results( $wpdb->prepare("SELECT blog_id, domain, path FROM $wpdb->blogs WHERE site_id = %d AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $wpdb->siteid), ARRAY_A );
 
+    $blog_list = array();
     foreach ( (array) $blogs as $details ) {
         $blog_list[ $details['blog_id'] ] = $details;
         $blog_list[ $details['blog_id'] ]['postcount'] = $wpdb->get_var( "SELECT COUNT(ID) FROM " . $wpdb->get_blog_prefix( $details['blog_id'] ). "posts WHERE post_status='publish' AND post_type='post'" );
     }
-    unset( $blogs );
-    $blogs = $blog_list;
-
-    if ( false == is_array( $blogs ) )
+
+    if ( ! $blog_list ) {
         return array();
-
-    if ( $num == 'all' )
-        return array_slice( $blogs, $start, count( $blogs ) );
-    else
-        return array_slice( $blogs, $start, $num );
+    }
+
+    if ( $num == 'all' ) {
+        return array_slice( $blog_list, $start, count( $blog_list ) );
+    } else {
+        return array_slice( $blog_list, $start, $num );
+    }
 }
 

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

@@ -309 +309 @@
     }
 
+    $paths = array();
+
     while ( count( $path_segments ) ) {
         $paths[] = '/' . implode( '/', $path_segments ) . '/';

trunk/src/wp-includes/post.php

@@ -353 +353 @@
         return $kids;
     } elseif ( $output == ARRAY_A ) {
-        foreach ( (array) $kids as $kid )
+        $weeuns = array();
+        foreach ( (array) $kids as $kid ) {
             $weeuns[$kid->ID] = get_object_vars($kids[$kid->ID]);
+        }
         return $weeuns;
     } elseif ( $output == ARRAY_N ) {
-        foreach ( (array) $kids as $kid )
+        $babes = array();
+        foreach ( (array) $kids as $kid ) {
             $babes[$kid->ID] = array_values(get_object_vars($kids[$kid->ID]));
+        }
         return $babes;
     } else {
@@ -1682 +1686 @@
         $object->labels['all_items'] = $object->labels['menu_name'];
 
-    foreach ( $nohier_vs_hier_defaults as $key => $value )
-            $defaults[$key] = $object->hierarchical ? $value[1] : $value[0];
-
+    $defaults = array();
+    foreach ( $nohier_vs_hier_defaults as $key => $value ) {
+        $defaults[$key] = $object->hierarchical ? $value[1] : $value[0];
+    }
     $labels = array_merge( $defaults, $object->labels );
     return (object)$labels;
@@ -2511 +2516 @@
     if ( is_string($post_mime_types) )
         $post_mime_types = array_map('trim', explode(',', $post_mime_types));
+
+    $wheres = array();
+
     foreach ( (array) $post_mime_types as $mime_type ) {
         $mime_type = preg_replace('/\s/', '', $mime_type);
@@ -5141 +5149 @@
         }
 
+        $types = array();
         // Icon basename - extension = MIME wildcard.
         foreach ( $icon_files as $file => $uri )
@@ -5514 +5523 @@
             $ptypes = $post_type;
         } elseif ( 'any' == $post_type ) {
+            $ptypes = array();
             // Just use the post_types in the supplied posts.
-            foreach ( $posts as $post )
+            foreach ( $posts as $post ) {
                 $ptypes[] = $post->post_type;
+            }
             $ptypes = array_unique($ptypes);
         } else {

trunk/src/wp-includes/rewrite.php

@@ -1289 +1289 @@
         //build a list from the rewritecode and queryreplace arrays, that will look something like
         //tagname=$matches[i] where i is the current $i
+        $queries = array();
         for ( $i = 0; $i < $num_tokens; ++$i ) {
             if ( 0 < $i )
@@ -1329 +1330 @@
 
             //get the 'tagname=$matches[i]'
-            $query = ( isset($queries) && is_array($queries) && !empty($num_toks) ) ? $queries[$num_toks - 1] : '';
+            $query = ( ! empty( $num_toks ) && isset( $queries[$num_toks - 1] ) ) ? $queries[$num_toks - 1] : '';
 
             //set up $ep_mask_specific which is used to match more specific URL types

trunk/src/wp-includes/taxonomy.php

@@ -3890 +3890 @@
 
     $term_items = array();
+    $terms_by_id = array();
+    $term_ids = array();
 
     foreach ( (array) $terms as $key => $term ) {

trunk/src/wp-includes/theme.php

@@ -407 +407 @@
 
     $wp_theme_directories = (array) $wp_theme_directories;
+    $relative_theme_roots = array();
 
     // Set up maybe-relative, maybe-absolute array of theme directories.