Changeset 17576

Timestamp:

03/31/2011 01:28:36 PM (14 years ago)

Author:

dd32

Message:

Be a party-pooper; No more Akismet Dancing upon upgrade; Respect custom WP_CONTENT_DIR for bundled plugins/theme installation; Respect custom WP_CONTENT_DIR/WP_LANG_DIR for Language files when upgrading; Standardise WP_Filesystem path method returns (They're trailing slash'd). Adds an exclusion list to copy_dir() as well as WP_Filesystem_Base::wp_lang_dir(). See #14484 See #11495

Location:

trunk/wp-admin/includes

Files:

• class-wp-filesystem-base.php (modified) (1 diff)
• file.php (modified) (3 diffs)
• update-core.php (modified) (6 diffs)

trunk/wp-admin/includes/class-wp-filesystem-base.php

@@ -83 +83 @@
      */
     function wp_themes_dir() {
-        return $this->wp_content_dir() . '/themes';
+        return $this->wp_content_dir() . 'themes/';
+    }
+    /**
+     * Returns the path on the remote filesystem of WP_LANG_DIR
+     *
+     * @since 3.2
+     * @access public
+     *
+     * @return string The location of the remote path.
+     */
+    function wp_lang_dir() {
+        return $this->find_folder(WP_LANG_DIR);
     }
 

trunk/wp-admin/includes/file.php

@@ -717 +717 @@
  * @param string $from source directory
  * @param string $to destination directory
+ * @param array $skip_list a list of files/folders to skip copying
  * @return mixed WP_Error on failure, True on success.
  */
-function copy_dir($from, $to) {
+function copy_dir($from, $to, $skip_list = array() ) {
     global $wp_filesystem;
 
@@ -727 +728 @@
     $to = trailingslashit($to);
 
+    $skip_regex = '';
+    foreach ( (array)$skip_list as $key => $skip_file )
+        $skip_regex .= preg_quote($skip_file, '!') . '|';
+
+    if ( !empty($skip_regex) )
+        $skip_regex = '!(' . rtrim($skip_regex, '|') . ')$!i';
+
     foreach ( (array) $dirlist as $filename => $fileinfo ) {
+        if ( !empty($skip_regex) )
+            if ( preg_match($skip_regex, $from . $filename) )
+                continue;
+
         if ( 'f' == $fileinfo['type'] ) {
             if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) ) {
@@ -740 +752 @@
                     return new WP_Error('mkdir_failed', __('Could not create directory.'), $to . $filename);
             }
-            $result = copy_dir($from . $filename, $to . $filename);
+            $result = copy_dir($from . $filename, $to . $filename, $skip_list);
             if ( is_wp_error($result) )
                 return $result;

trunk/wp-admin/includes/update-core.php

@@ -247 +247 @@
 
 /**
+ * Stores new files in wp-content to copy
+ *
+ * The contents of this array indicate any new bundled plugins/themes which
+ * should be installed with the WordPress Upgrade. These items will not be
+ * re-installed in future upgrades, this behaviour is controlled by the 
+ * introduced version present here being older than the current installed version.
+ *
+ * The content of this array should follow the following format:
+ *  Filename (relative to wp-content) => Introduced version
+ * Directories should be noted by suffixing it with a trailing slash (/)
+ *
+ * @since 3.2
+ * @global array $_new_bundled_files
+ * @var array
+ * @name $_new_bundled_files
+ */
+global $_new_bundled_files;
+
+$_new_bundled_files = array(
+'plugins/akismet/' => '2.0',
+'themes/twentyten/' => '3.2',
+);
+
+/**
  * Upgrade the core of WordPress.
  *
@@ -255 +279 @@
  * The files in the {@link $_old_files} list will be removed and the new files
  * copied from the zip file after the database is upgraded.
+ *
+ * The files in the {@link $_new_bundled_files} list will be added to the installation
+ * if the version is greater than or equal to the old version being upgraded.
  *
  * The steps for the upgrader for after the new release is downloaded and
@@ -262 +289 @@
  *   3. Copy new WordPress directory over old WordPress files.
  *   4. Upgrade WordPress to new version.
+ *     4.1. Copy all files/folders other than wp-content
+ *     4.2. Copy any language files to WP_LANG_DIR (which may differ from WP_CONTENT_DIR
+ *     4.3. Copy any new bundled themes/plugins to their respective locations
  *   5. Delete new WordPress directory path.
  *   6. Delete .maintenance file.
@@ -287 +317 @@
  */
 function update_core($from, $to) {
-    global $wp_filesystem, $_old_files, $wpdb;
+    global $wp_filesystem, $_old_files, $_new_bundled_files, $wpdb;
 
     @set_time_limit( 300 );
@@ -312 +342 @@
     apply_filters('update_feedback', __('Verifying the unpacked files…'));
     $distro = '';
-    $roots = array( '/wordpress', '/wordpress-mu' );
+    $roots = array( '/wordpress/', '/wordpress-mu/' );
     foreach( $roots as $root ) {
-        if ( $wp_filesystem->exists($from . $root . '/wp-settings.php') && $wp_filesystem->exists($from . $root . '/wp-admin/admin.php') &&
-            $wp_filesystem->exists($from . $root . '/wp-includes/functions.php') ) {
+        if ( $wp_filesystem->exists($from . $root . 'wp-settings.php') && $wp_filesystem->exists($from . $root . 'wp-admin/admin.php') &&
+            $wp_filesystem->exists($from . $root . 'wp-includes/functions.php') ) {
             $distro = $root;
             break;
@@ -334 +364 @@
 
     // Copy new versions of WP files into place.
-    $result = copy_dir($from . $distro, $to);
+    $result = copy_dir($from . $distro, $to, array('wp-content') );
+
+    // Custom Content Directory needs updating now.
+    // Copy Languages
+    if ( !is_wp_error($result) && $wp_filesystem->is_dir($from . $distro . 'wp-content/languages') ) {
+        if ( !@is_dir(WP_LANG_DIR) && 0 === strpos(WP_LANG_DIR, ABSPATH) ) { // Check the language directory exists first
+            $wp_filesystem->mkdir($to . str_replace(WP_LANG_DIR, ABSPATH, ''), FS_CHMOD_DIR); // If it's within the ABSPATH we can handle it here, otherwise they're out of luck.
+            clearstatcache(); // for FTP, Need to clear the stat cache
+        }
+
+        if ( @is_dir(WP_LANG_DIR) ) {
+            $wp_lang_dir = $wp_filesystem->wp_lang_dir();
+            $result = copy_dir($from . $distro . 'wp-content/languages/', $wp_lang_dir);
+        }
+    }
+
+    // Copy New bundled plugins & themes
+    // This gives us the ability to install new plugins & themes bundled with future versions of WordPress whilst avoiding the re-install upon upgrade issue.
+    if ( !is_wp_error($result) && ( ! defined('CORE_UPGRADE_SKIP_NEW_BUNDLED') || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {
+        $old_version = $GLOBALS['wp_version']; // $wp_version in local scope == new version
+        foreach ( (array) $_new_bundled_files as $file => $introduced_version ) {
+            // If $introduced version is greater than what the site was previously running
+            if ( version_compare($introduced_version, $old_version, '>') ) {
+                $directory = ('/' == $file[ strlen($file)-1 ]);
+                list($type, $filename) = explode('/', $file, 2);
+                if ( 'plugins' == $type )
+                    $dest = $wp_filesystem->wp_plugins_dir();
+                elseif ( 'themes' == $type )
+                    $dest = $wp_filesystem->wp_themes_dir();
+
+                if ( ! $directory ) {
+                    if ( $wp_filesystem->exists($dest . '/' . $filename) )
+                        continue;
+
+                    if ( ! $wp_filesystem->copy($from . $distro . 'wp-content/' . $file, $dest . '/' . $filename, FS_CHMOD_FILE) )
+                        $result = new WP_Error('copy_failed', __('Could not copy file.'), $dest . '/' . $filename);
+                } else {
+                    if ( $wp_filesystem->is_dir($dest . '/' . $filename) )
+                        continue;
+
+                    $wp_filesystem->mkdir($dest . $filename, FS_CHMOD_DIR);
+                    $_result = copy_dir( $from . $distro . 'wp-content/' . $file, $dest . $filename);
+                    if ( is_wp_error($_result) ) //If a error occurs partway through this final step, keep the error flowing through, but keep process going.
+                        $result = $_result;
+                }
+            }
+        } //end foreach
+    }
+
+    // Handle $result error from the above blocks
     if ( is_wp_error($result) ) {
         $wp_filesystem->delete($maintenance_file);