Changeset 33481

Timestamp:

07/29/2015 06:52:42 AM (11 years ago)

Author:

pento

Message:

Don't blindly trust the output of glob() to be an array.

Props kitchin.

Merge of [33447] to the 4.2 branch.

Fixes #33093.

Location:

branches/4.2/src

Files:

• wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)
• wp-admin/includes/update-core.php (modified) (1 diff)
• wp-includes/l10n.php (modified) (1 diff)

branches/4.2/src/wp-admin/includes/class-wp-upgrader.php

@@ -973 +973 @@
                 // Check the folder contains at least 1 valid plugin.
                 $plugins_found = false;
-                foreach ( glob( $working_directory . '*.php' ) as $file ) {
-                        $info = get_plugin_data($file, false, false);
-                        if ( !empty( $info['Name'] ) ) {
-                                $plugins_found = true;
-                                break;
+                $files = glob( $working_directory . '*.php' );
+                if ( $files ) {
+                        foreach ( $files as $file ) {
+                                $info = get_plugin_data( $file, false, false );
+                                if ( ! empty( $info['Name'] ) ) {
+                                        $plugins_found = true;
+                                        break;
+                                }
                         }
                 }

branches/4.2/src/wp-admin/includes/update-core.php

@@ -1250 +1250 @@
         }
 
-        foreach ( glob( $directory . '*', GLOB_ONLYDIR ) as $dir ) {
-                $files = array_merge( $files, _upgrade_422_find_genericons_files_in_folder( $dir ) );
+        $dirs = glob( $directory . '*', GLOB_ONLYDIR );
+        if ( $dirs ) {
+                foreach ( $dirs as $dir ) {
+                        $files = array_merge( $files, _upgrade_422_find_genericons_files_in_folder( $dir ) );
+                }
         }
 

branches/4.2/src/wp-includes/l10n.php

@@ -764 +764 @@
         $languages = array();
 
-        foreach( (array)glob( ( is_null( $dir) ? WP_LANG_DIR : $dir ) . '/*.mo' ) as $lang_file ) {
-                $lang_file = basename($lang_file, '.mo');
-                if ( 0 !== strpos( $lang_file, 'continents-cities' ) && 0 !== strpos( $lang_file, 'ms-' ) &&
-                        0 !== strpos( $lang_file, 'admin-' ))
-                        $languages[] = $lang_file;
+        $lang_files = glob( ( is_null( $dir) ? WP_LANG_DIR : $dir ) . '/*.mo' );
+        if ( $lang_files ) {
+                foreach( $lang_files as $lang_file ) {
+                        $lang_file = basename( $lang_file, '.mo' );
+                        if ( 0 !== strpos( $lang_file, 'continents-cities' ) && 0 !== strpos( $lang_file, 'ms-' ) &&
+                                0 !== strpos( $lang_file, 'admin-' ) ) {
+                                $languages[] = $lang_file;
+                        }
+                }
         }