<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[25082] trunk/src/wp-admin/includes: Theme Installer/Updater: Handle custom Theme directories when updating themes, and installing new themes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25082">25082</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-08-22 04:49:06 +0000 (Thu, 22 Aug 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Installer/Updater: Handle custom Theme directories when updating themes, and installing new themes. Fixes <a href="http://core.trac.wordpress.org/ticket/22501">#22501</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpfilesystembasephp">trunk/src/wp-admin/includes/class-wp-filesystem-base.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpfilesystembasephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-base.php (25081 => 25082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2013-08-22 04:02:13 UTC (rev 25081)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2013-08-22 04:49:06 UTC (rev 25082)
</span><span class="lines">@@ -79,10 +79,17 @@
</span><span class="cx"> * @since 2.7
</span><span class="cx"> * @access public
</span><span class="cx"> *
</span><ins>+ * @param string $theme The Theme stylesheet or template for the directory
</ins><span class="cx"> * @return string The location of the remote path.
</span><span class="cx"> */
</span><del>- function wp_themes_dir() {
- return $this->wp_content_dir() . 'themes/';
</del><ins>+ function wp_themes_dir( $theme = false ) {
+ $theme_root = get_theme_root( $theme );
+
+ // Account for relative theme roots
+ if ( '/themes' == $theme_root || ! is_dir( $theme_root ) )
+ $theme_root = WP_CONTENT_DIR . $theme_root;
+
+ return $this->find_folder( $theme_root );
</ins><span class="cx"> }
</span><span class="cx"> /**
</span><span class="cx"> * Returns the path on the remote filesystem of WP_LANG_DIR
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php (25081 => 25082)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2013-08-22 04:02:13 UTC (rev 25081)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2013-08-22 04:49:06 UTC (rev 25082)
</span><span class="lines">@@ -93,8 +93,8 @@
</span><span class="cx"> if ( ! $wp_filesystem->wp_plugins_dir() )
</span><span class="cx"> return new WP_Error('fs_no_plugins_dir', $this->strings['fs_no_plugins_dir']);
</span><span class="cx"> break;
</span><del>- case WP_CONTENT_DIR . '/themes':
- if ( ! $wp_filesystem->find_folder(WP_CONTENT_DIR . '/themes') )
</del><ins>+ case get_theme_root():
+ if ( ! $wp_filesystem->wp_themes_dir() )
</ins><span class="cx"> return new WP_Error('fs_no_themes_dir', $this->strings['fs_no_themes_dir']);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="lines">@@ -164,7 +164,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function install_package($args = array()) {
</span><del>- global $wp_filesystem;
</del><ins>+ global $wp_filesystem, $wp_theme_directories;
+
</ins><span class="cx"> $defaults = array( 'source' => '', 'destination' => '', //Please always pass these
</span><span class="cx"> 'clear_destination' => false, 'clear_working' => false,
</span><span class="cx"> 'abort_if_destination_exists' => true,
</span><span class="lines">@@ -208,8 +209,10 @@
</span><span class="cx"> if ( $source !== $remote_source )
</span><span class="cx"> $source_files = array_keys( $wp_filesystem->dirlist($source) );
</span><span class="cx">
</span><del>- //Protection against deleting files in any important base directories.
- if ( in_array( $destination, array(ABSPATH, WP_CONTENT_DIR, WP_PLUGIN_DIR, WP_CONTENT_DIR . '/themes') ) ) {
</del><ins>+ // Protection against deleting files in any important base directories.
+ // 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 ) ) ) {
</ins><span class="cx"> $remote_destination = trailingslashit($remote_destination) . trailingslashit(basename($source));
</span><span class="cx"> $destination = trailingslashit($destination) . trailingslashit(basename($source));
</span><span class="cx"> }
</span><span class="lines">@@ -727,7 +730,7 @@
</span><span class="cx"> // Install the parent theme
</span><span class="cx"> $parent_result = $this->run( array(
</span><span class="cx"> 'package' => $api->download_link,
</span><del>- 'destination' => WP_CONTENT_DIR . '/themes',
</del><ins>+ 'destination' => get_theme_root(),
</ins><span class="cx"> 'clear_destination' => false, //Do not overwrite files.
</span><span class="cx"> 'clear_working' => true
</span><span class="cx"> ) );
</span><span class="lines">@@ -760,11 +763,11 @@
</span><span class="cx"> add_filter('upgrader_post_install', array(&$this, 'check_parent_theme_filter'), 10, 3);
</span><span class="cx">
</span><span class="cx"> $options = array(
</span><del>- 'package' => $package,
- 'destination' => WP_CONTENT_DIR . '/themes',
- 'clear_destination' => false, //Do not overwrite files.
- 'clear_working' => true
- );
</del><ins>+ 'package' => $package,
+ 'destination' => get_theme_root(),
+ 'clear_destination' => false, //Do not overwrite files.
+ 'clear_working' => true
+ );
</ins><span class="cx">
</span><span class="cx"> $this->run($options);
</span><span class="cx">
</span><span class="lines">@@ -803,14 +806,14 @@
</span><span class="cx"> add_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
</span><span class="cx">
</span><span class="cx"> $options = array(
</span><del>- 'package' => $r['package'],
- 'destination' => WP_CONTENT_DIR . '/themes',
- 'clear_destination' => true,
- 'clear_working' => true,
- 'hook_extra' => array(
- 'theme' => $theme
- )
- );
</del><ins>+ 'package' => $r['package'],
+ 'destination' => get_theme_root( $theme ),
+ 'clear_destination' => true,
+ 'clear_working' => true,
+ 'hook_extra' => array(
+ 'theme' => $theme
+ ),
+ );
</ins><span class="cx">
</span><span class="cx"> $this->run($options);
</span><span class="cx">
</span><span class="lines">@@ -883,14 +886,14 @@
</span><span class="cx"> $r = $current->response[ $theme ];
</span><span class="cx">
</span><span class="cx"> $options = array(
</span><del>- 'package' => $r['package'],
- 'destination' => WP_CONTENT_DIR . '/themes',
- 'clear_destination' => true,
- 'clear_working' => true,
- 'hook_extra' => array(
- 'theme' => $theme
- )
- );
</del><ins>+ 'package' => $r['package'],
+ 'destination' => get_theme_root( $theme ),
+ 'clear_destination' => true,
+ 'clear_working' => true,
+ 'hook_extra' => array(
+ 'theme' => $theme
+ ),
+ );
</ins><span class="cx">
</span><span class="cx"> $result = $this->run($options);
</span><span class="cx">
</span><span class="lines">@@ -984,18 +987,22 @@
</span><span class="cx"> return $return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function delete_old_theme($removed, $local_destination, $remote_destination, $theme) {
</del><ins>+ function delete_old_theme( $removed, $local_destination, $remote_destination, $theme ) {
</ins><span class="cx"> global $wp_filesystem;
</span><span class="cx">
</span><del>- $theme = isset($theme['theme']) ? $theme['theme'] : '';
</del><ins>+ if ( is_wp_error( $removed ) )
+ return $removed; // Pass errors through.
</ins><span class="cx">
</span><del>- if ( is_wp_error($removed) || empty($theme) )
- return $removed; //Pass errors through.
</del><ins>+ if ( ! isset( $theme['theme'] ) )
+ return $removed;
</ins><span class="cx">
</span><del>- $themes_dir = $wp_filesystem->wp_themes_dir();
- if ( $wp_filesystem->exists( trailingslashit($themes_dir) . $theme ) )
- if ( ! $wp_filesystem->delete( trailingslashit($themes_dir) . $theme, true ) )
</del><ins>+ $theme = $theme['theme'];
+ $themes_dir = trailingslashit( $wp_filesystem->wp_themes_dir( $theme ) );
+ if ( $wp_filesystem->exists( $themes_dir . $theme ) ) {
+ if ( ! $wp_filesystem->delete( $themes_dir . $theme, true ) )
</ins><span class="cx"> return false;
</span><ins>+ }
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1007,7 +1014,7 @@
</span><span class="cx"> else
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- return wp_get_theme( $theme, WP_CONTENT_DIR . '/themes/' );
</del><ins>+ return wp_get_theme( $theme );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>