Changeset 23251 for branches/3.5/wp-admin/includes/update-core.php

Timestamp:

01/03/2013 07:11:35 AM (13 years ago)

Author:

dd32

Message:

When copying new bundled themes & plugins, bail early if the distro doesn't include the bundled item. This prevents us from creating an empty directory in the destination when the source doesn't exist. See #22856. Merges [23179] to the 3.5 branch

File:

• branches/3.5/wp-admin/includes/update-core.php (modified) (1 diff, 1 prop)

branches/3.5/wp-admin/includes/update-core.php

@@ -703 +703 @@
                 list($type, $filename) = explode('/', $file, 2);
 
+                // Check to see if the bundled items exist before attempting to copy them
+                if ( ! $wp_filesystem->exists( $from . $distro . 'wp-content/' . $file ) )
+                    continue;
+
                 if ( 'plugins' == $type )
                     $dest = $wp_filesystem->wp_plugins_dir();