<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#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>
<title>[11926] trunk/wp-admin/includes/class-wp-upgrader.php: Plugin/
Theme installer: Do not bail if empty destination directory exists,
props dd32, fixes #10775</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/11926">11926</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-09-13 23:00:45 +0000 (Sun, 13 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Plugin/Theme installer: Do not bail if empty destination directory exists, props dd32, fixes <a href="http://trac.wordpress.org/ticket/10775">#10775</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (11925 => 11926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2009-09-13 21:18:55 UTC (rev 11925)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2009-09-13 23:00:45 UTC (rev 11926)
</span><span class="lines">@@ -210,24 +210,26 @@
</span><span class="cx"> $destination = trailingslashit($destination) . trailingslashit(basename($source));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- //If we're not clearing the destination folder, and something exists there allready, Bail.
- if ( ! $clear_destination && $wp_filesystem->exists($remote_destination) ) {
- $wp_filesystem->delete($remote_source, true); //Clear out the source files.
- return new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
- } else if ( $clear_destination ) {
- //We're going to clear the destination if theres something there
- $this->skin->feedback('remove_old');
-
- $removed = true;
- if ( $wp_filesystem->exists($remote_destination) )
</del><ins>+ if ( $wp_filesystem->exists($remote_destination) ) {
+ if ( $clear_destination ) {
+ //We're going to clear the destination if theres something there
+ $this->skin->feedback('remove_old');
</ins><span class="cx"> $removed = $wp_filesystem->delete($remote_destination, true);
</span><ins>+ $removed = apply_filters('upgrader_clear_destination', $removed, $local_destination, $remote_destination, $hook_extra);
</ins><span class="cx">
</span><del>- $removed = apply_filters('upgrader_clear_destination', $removed, $local_destination, $remote_destination, $hook_extra);
-
- if ( is_wp_error($removed) )
- return $removed;
- else if ( ! $removed )
- return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
</del><ins>+ if ( is_wp_error($removed) )
+ return $removed;
+ else if ( ! $removed )
+ return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
+ } else {
+ //If we're not clearing the destination folder and something exists there allready, Bail.
+ //But first check to see if there are actually any files in the folder.
+ $_files = $wp_filesystem->dirlist($remote_destination);
+ if ( ! empty($_files) ) {
+ $wp_filesystem->delete($remote_source, true); //Clear out the source files.
+ return new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //Create destination if needed
</span></span></pre>
</div>
</div>
</body>
</html>