<!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 { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { 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>[12997] trunk/wp-admin/includes: Fix recursive chmod for WP_Filesystem.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12997">12997</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-07 01:12:29 +0000 (Sun, 07 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix recursive chmod for WP_Filesystem. Props reaperhulk for FtpExt. Fixes <a href="http://trac.wordpress.org/ticket/11261">#11261</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpfilesystemdirectphp">trunk/wp-admin/includes/class-wp-filesystem-direct.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemftpextphp">trunk/wp-admin/includes/class-wp-filesystem-ftpext.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemftpsocketsphp">trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpfilesystemdirectphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-direct.php (12996 => 12997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-direct.php 2010-02-07 00:03:10 UTC (rev 12996)
+++ trunk/wp-admin/includes/class-wp-filesystem-direct.php 2010-02-07 01:12:29 UTC (rev 12997)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx"> //Is a directory, and we want recursive
</span><span class="cx"> $file = trailingslashit($file);
</span><span class="cx"> $filelist = $this->dirlist($file);
</span><del>- foreach ($filelist as $filename)
</del><ins>+ foreach ( (array)$filelist as $filename => $filemeta)
</ins><span class="cx"> $this->chmod($file . $filename, $mode, $recursive);
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemftpextphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (12996 => 12997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ftpext.php 2010-02-07 00:03:10 UTC (rev 12996)
+++ trunk/wp-admin/includes/class-wp-filesystem-ftpext.php 2010-02-07 01:12:29 UTC (rev 12997)
</span><span class="lines">@@ -154,17 +154,17 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! $recursive || ! $this->is_dir($file) ) {
- if ( ! function_exists('ftp_chmod') )
- return @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
- return @ftp_chmod($this->link, $mode, $file);
</del><ins>+ // chmod any sub-objects if recursive.
+ if ( $recursive && $this->is_dir($file) ) {
+ $filelist = $this->dirlist($file);
+ foreach ( (array)$filelist as $filename => $filemeta )
+ $this->chmod($file . '/' . $filename, $mode, $recursive);
</ins><span class="cx"> }
</span><del>- //Is a directory, and we want recursive
- $filelist = $this->dirlist($file);
- foreach ( $filelist as $filename ) {
- $this->chmod($file . '/' . $filename, $mode, $recursive);
- }
- return true;
</del><ins>+
+ // chmod the file or directory
+ if ( ! function_exists('ftp_chmod') )
+ return @ftp_site($this->link, sprintf('CHMOD %o %s', $mode, $file));
+ return @ftp_chmod($this->link, $mode, $file);
</ins><span class="cx"> }
</span><span class="cx"> function chown($file, $owner, $recursive = false ) {
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemftpsocketsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php (12996 => 12997)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2010-02-07 00:03:10 UTC (rev 12996)
+++ trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2010-02-07 01:12:29 UTC (rev 12997)
</span><span class="lines">@@ -164,16 +164,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( ! $recursive || ! $this->is_dir($file) ) {
- return $this->ftp->chmod($file, $mode);
</del><ins>+ // chmod any sub-objects if recursive.
+ if ( $recursive && $this->is_dir($file) ) {
+ $filelist = $this->dirlist($file);
+ foreach ( (array)$filelist as $filename => $filemeta )
+ $this->chmod($file . '/' . $filename, $mode, $recursive);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- //Is a directory, and we want recursive
- $filelist = $this->dirlist($file);
- foreach ( $filelist as $filename )
- $this->chmod($file . '/' . $filename, $mode, $recursive);
-
- return true;
</del><ins>+ // chmod the file or directory
+ return $this->ftp->chmod($file, $mode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function chown($file, $owner, $recursive = false ) {
</span></span></pre>
</div>
</div>
</body>
</html>