WordPress 4.2.4

[autoinstalls/wordpress.git] / wp-admin / includes / update-core.php

diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index a15cc887e12158e8646e9bf7b215d201f1c10021..04cd780b21c161626c2bd9dfb07f4c0b5811b56a 100644 (file)
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -1249,8 +1249,11 @@ function _upgrade_422_find_genericons_files_in_folder( $directory ) {
                $files[] = "{$directory}example.html";
        }
 
-       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 ) );
+               }
        }
 
        return $files;