<!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>[38380] trunk/src/wp-admin/includes: FTP: ensure that there is only one class named `ftp`, which is what is expected in the loading of this arcane library.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/38380">38380</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/38380","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-26 18:46:17 +0000 (Fri, 26 Aug 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>FTP: ensure that there is only one class named `ftp`, which is what is expected in the loading of this arcane library. This ensures that an autoload generator, something along the lines of Composer, won't hiccup when it gets to these files.
See <a href="https://core.trac.wordpress.org/ticket/36335">#36335</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclassftppurephp">trunk/src/wp-admin/includes/class-ftp-pure.php</a></li>
<li><a href="#trunksrcwpadminincludesclassftpsocketsphp">trunk/src/wp-admin/includes/class-ftp-sockets.php</a></li>
<li><a href="#trunksrcwpadminincludesclassftpphp">trunk/src/wp-admin/includes/class-ftp.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclassftppurephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-ftp-pure.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-ftp-pure.php 2016-08-26 18:24:40 UTC (rev 38379)
+++ trunk/src/wp-admin/includes/class-ftp-pure.php 2016-08-26 18:46:17 UTC (rev 38380)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,16 +25,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @link http://www.phpclasses.org/browse/package/1743.html Site
</span><span class="cx" style="display: block; padding: 0 10px"> * @license LGPL http://www.opensource.org/licenses/lgpl-license.html
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class ftp extends ftp_base {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class ftp_pure extends ftp_base {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function __construct($verb=FALSE, $le=FALSE) {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct(false, $verb, $le);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function ftp($verb=FALSE, $le=FALSE) {
- $this->__construct($verb, $le);
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // <!-- --------------------------------------------------------------------------------------- -->
</span><span class="cx" style="display: block; padding: 0 10px"> // <!-- Private functions -->
</span><span class="cx" style="display: block; padding: 0 10px"> // <!-- --------------------------------------------------------------------------------------- -->
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassftpsocketsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-ftp-sockets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-ftp-sockets.php 2016-08-26 18:24:40 UTC (rev 38379)
+++ trunk/src/wp-admin/includes/class-ftp-sockets.php 2016-08-26 18:46:17 UTC (rev 38380)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,16 +25,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @link http://www.phpclasses.org/browse/package/1743.html Site
</span><span class="cx" style="display: block; padding: 0 10px"> * @license LGPL http://www.opensource.org/licenses/lgpl-license.html
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-class ftp extends ftp_base {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+class ftp_sockets extends ftp_base {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function __construct($verb=FALSE, $le=FALSE) {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct(true, $verb, $le);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function ftp($verb=FALSE, $le=FALSE) {
- $this->__construct($verb, $le);
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // <!-- --------------------------------------------------------------------------------------- -->
</span><span class="cx" style="display: block; padding: 0 10px"> // <!-- Private functions -->
</span><span class="cx" style="display: block; padding: 0 10px"> // <!-- --------------------------------------------------------------------------------------- -->
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassftpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-ftp.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-ftp.php 2016-08-26 18:24:40 UTC (rev 38379)
+++ trunk/src/wp-admin/includes/class-ftp.php 2016-08-26 18:46:17 UTC (rev 38380)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,7 +818,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function glob_regexp($pattern,$probe) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sensitive=(PHP_OS!='WIN32');
</span><span class="cx" style="display: block; padding: 0 10px"> return ($sensitive?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $probe ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ preg_match( '/' . preg_quote( $pattern, '/' ) . '/', $probe ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> preg_match( '/' . preg_quote( $pattern, '/' ) . '/i', $probe )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -904,3 +904,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once dirname( __FILE__ ) . "/class-ftp-" . ( $mod_sockets ? "sockets" : "pure" ) . ".php";
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+if ( $mod_sockets ) {
+ class ftp extends ftp_sockets {}
+} else {
+ class ftp extends ftp_pure {}
+}
</ins></span></pre>
</div>
</div>
</body>
</html>