Changeset 48401

Timestamp:

07/07/2020 08:36:41 PM (4 years ago)

Author:

desrosj

Message:

Administration: Fix failing tests as a result of [48397].

Because of changes to how PHP handles arrays used in foreach() loops in PHP >= 7.0, [48397] resulted in a failing test for PHP 5.6.

This calls reset() after using the $results array in the foreach() to ensure the array is treated the same and as expected.

Props azaozz, desrosj, SergeyBiryukov, xknown.
See #50448.

Location:

trunk/src/wp-admin/includes

Files:

• class-plugin-upgrader.php (modified) (1 diff)
• class-theme-upgrader.php (modified) (1 diff)

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

@@ -393 +393 @@
         }
         update_option( 'auto_plugin_theme_update_emails', $past_failure_emails );
+        reset( $results );
 
         return $results;

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

@@ -502 +502 @@
         }
         update_option( 'auto_plugin_theme_update_emails', $past_failure_emails );
+        reset( $results );
 
         return $results;