<!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>[15098] trunk/wp-admin/includes/file.php:
  Clarify the connection information requested in request_filesystem_credentials
 ()
  to reduce confusion surrounding FTP information versus your WordPress login
 .</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15098">15098</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-06-01 20:35:59 +0000 (Tue, 01 Jun 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Clarify the connection information requested in request_filesystem_credentials() to reduce confusion surrounding FTP information versus your WordPress login. see <a href="http://trac.wordpress.org/ticket/13467">#13467</a>, props jane.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (15097 => 15098)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php        2010-06-01 18:08:27 UTC (rev 15097)
+++ trunk/wp-admin/includes/file.php        2010-06-01 20:35:59 UTC (rev 15098)
</span><span class="lines">@@ -964,8 +964,16 @@
</span><span class="cx"> &lt;div class=&quot;wrap&quot;&gt;
</span><span class="cx"> &lt;?php screen_icon(); ?&gt;
</span><span class="cx"> &lt;h2&gt;&lt;?php _e('Connection Information') ?&gt;&lt;/h2&gt;
</span><del>-&lt;p&gt;&lt;?php _e('To perform the requested action, connection information is required.') ?&gt;&lt;/p&gt;
-
</del><ins>+&lt;p&gt;&lt;?php
+        _e('To perform the requested action, WordPress needs to access to your web server.');
+        if ( ( isset( $types['ftp'] ) || isset( $types['ftps'] ) ) ) {
+                if ( isset( $types['ssh'] ) )
+                        _e('Please enter your FTP or SSH credentials to proceed.');
+                else
+                        _e('Please enter your FTP credentials to proceed.');
+        }
+        _e('If you do not remember your credentials, you should contact your web host.');
+?&gt;&lt;/p&gt;
</ins><span class="cx"> &lt;table class=&quot;form-table&quot;&gt;
</span><span class="cx"> &lt;tr valign=&quot;top&quot;&gt;
</span><span class="cx"> &lt;th scope=&quot;row&quot;&gt;&lt;label for=&quot;hostname&quot;&gt;&lt;?php _e('Hostname') ?&gt;&lt;/label&gt;&lt;/th&gt;
</span></span></pre>
</div>
</div>

</body>
</html>