<!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>[12268] trunk/wp-admin/includes: Fix wpfs root dir location.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12268">12268</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-11-23 21:52:13 +0000 (Mon, 23 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix wpfs root dir location. Props dd32. fixes <a href="http://trac.wordpress.org/ticket/11152">#11152</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpfilesystemftpextphp">trunk/wp-admin/includes/class-wp-filesystem-ftpext.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpfilesystemftpextphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (12267 => 12268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-ftpext.php 2009-11-23 21:04:11 UTC (rev 12267)
+++ trunk/wp-admin/includes/class-wp-filesystem-ftpext.php 2009-11-23 21:52:13 UTC (rev 12268)
</span><span class="lines">@@ -82,8 +82,8 @@
</span><span class="cx">
</span><span class="cx"> //Set the Connection to use Passive FTP
</span><span class="cx"> @ftp_pasv( $this->link, true );
</span><del>- if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FTP_TIMEOUT )
- @ftp_set_option($this->link, FTP_TIMEOUT_SEC, FTP_TIMEOUT);
</del><ins>+ if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT )
+ @ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (12267 => 12268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2009-11-23 21:04:11 UTC (rev 12267)
+++ trunk/wp-admin/includes/file.php 2009-11-23 21:52:13 UTC (rev 12268)
</span><span class="lines">@@ -738,9 +738,9 @@
</span><span class="cx"> unset($credentials['port']);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( defined('FTP_SSH') || (defined('FS_METHOD') && 'ssh' == FS_METHOD) )
</del><ins>+ if ( (defined('FTP_SSH') && FTP_SSH) || (defined('FS_METHOD') && 'ssh' == FS_METHOD) )
</ins><span class="cx"> $credentials['connection_type'] = 'ssh';
</span><del>- else if ( defined('FTP_SSL') && 'ftpext' == $type ) //Only the FTP Extension understands SSL
</del><ins>+ else if ( (defined('FTP_SSL') && FTP_SSL) && 'ftpext' == $type ) //Only the FTP Extension understands SSL
</ins><span class="cx"> $credentials['connection_type'] = 'ftps';
</span><span class="cx"> else if ( !empty($_POST['connection_type']) )
</span><span class="cx"> $credentials['connection_type'] = stripslashes($_POST['connection_type']);
</span><span class="lines">@@ -837,7 +837,7 @@
</span><span class="cx"> <fieldset><legend class="screen-reader-text"><span><?php _e('Connection Type') ?></span></legend>
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>- $disabled = defined('FTP_SSL') || defined('FTP_SSH') ? '' : ' disabled="disabled"';
</del><ins>+ $disabled = (defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH) ? ' disabled="disabled"' : '';
</ins><span class="cx">
</span><span class="cx"> foreach ( $types as $name => $text ) : ?>
</span><span class="cx"> <label for="<?php echo esc_attr($name) ?>">
</span></span></pre>
</div>
</div>
</body>
</html>