Changeset 25180

Timestamp:

08/30/2013 07:34:24 AM (13 years ago)

Author:

dd32

Message:

Theme Upgrader: Be super-careful and check the contents of the $wp_theme_directories variable before merging it, if someone has changed it directly, or worse, unset it, this could've resulted in the $protected_directories being empty. See [25082] See #22501

File:

• trunk/src/wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)

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

@@ -213 +213 @@
                 // Theme_Upgrader & Plugin_Upgrader also trigger this, as they pass the destination directory (WP_PLUGIN_DIR / wp-content/themes)
                 // intending to copy the directory into the directory, whilst they pass the source as the actual files to copy.
-                if ( in_array( $destination, array_merge( array( ABSPATH, WP_CONTENT_DIR, WP_PLUGIN_DIR, WP_CONTENT_DIR . '/themes' ), $wp_theme_directories ) ) ) {
+                $protected_directories = array( ABSPATH, WP_CONTENT_DIR, WP_PLUGIN_DIR, WP_CONTENT_DIR . '/themes' );
+                if ( is_array( $wp_theme_directories ) )
+                        $protected_directories = array_merge( $protected_directories, $wp_theme_directories );
+                if ( in_array( $destination, $protected_directories ) ) {
                         $remote_destination = trailingslashit($remote_destination) . trailingslashit(basename($source));
                         $destination = trailingslashit($destination) . trailingslashit(basename($source));