<!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>[25349] trunk/src/wp-admin/includes: Make use of the mbstring.func_overload helper functions in WP_Filesystem so byte lengths are properly determined.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25349">25349</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-09-11 08:26:57 +0000 (Wed, 11 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make use of the mbstring.func_overload helper functions in WP_Filesystem so byte lengths are properly determined. See <a href="http://core.trac.wordpress.org/ticket/25259">#25259</a> Fixes <a href="http://core.trac.wordpress.org/ticket/25237">#25237</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemdirectphp">trunk/src/wp-admin/includes/class-wp-filesystem-direct.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpextphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpsocketsphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpfilesystemdirectphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-direct.php (25348 => 25349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-direct.php 2013-09-11 08:12:24 UTC (rev 25348)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-direct.php 2013-09-11 08:26:57 UTC (rev 25349)
</span><span class="lines">@@ -68,11 +68,17 @@
</span><span class="cx"> if ( ! $fp )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ mbstring_binary_safe_encoding();
+
+ $data_length = strlen( $contents );
+
</ins><span class="cx"> $bytes_written = fwrite( $fp, $contents );
</span><span class="cx">
</span><ins>+ reset_mbstring_encoding();
+
</ins><span class="cx"> fclose( $fp );
</span><span class="cx">
</span><del>- if ( false === $bytes_written || $bytes_written != strlen( $contents ) )
</del><ins>+ if ( $data_length !== $bytes_written )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> $this->chmod( $file, $mode );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemftpextphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php (25348 => 25349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php 2013-09-11 08:12:24 UTC (rev 25348)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php 2013-09-11 08:26:57 UTC (rev 25349)
</span><span class="lines">@@ -118,8 +118,14 @@
</span><span class="cx"> if ( ! $temp )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ mbstring_binary_safe_encoding();
+
+ $data_length = strlen( $contents );
</ins><span class="cx"> $bytes_written = fwrite( $temp, $contents );
</span><del>- if ( false === $bytes_written || $bytes_written != strlen( $contents ) ) {
</del><ins>+
+ reset_mbstring_encoding();
+
+ if ( $data_length !== $bytes_written ) {
</ins><span class="cx"> fclose( $temp );
</span><span class="cx"> unlink( $tempfile );
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemftpsocketsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php (25348 => 25349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2013-09-11 08:12:24 UTC (rev 25348)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2013-09-11 08:26:57 UTC (rev 25349)
</span><span class="lines">@@ -89,12 +89,19 @@
</span><span class="cx"> if ( ! $temphandle = fopen($temp, 'w+') )
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ mbstring_binary_safe_encoding();
+
</ins><span class="cx"> if ( ! $this->ftp->fget($temphandle, $file) ) {
</span><span class="cx"> fclose($temphandle);
</span><span class="cx"> unlink($temp);
</span><ins>+
+ reset_mbstring_encoding();
+
</ins><span class="cx"> return ''; // Blank document, File does exist, It's just blank.
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ reset_mbstring_encoding();
+
</ins><span class="cx"> fseek( $temphandle, 0 ); // Skip back to the start of the file being written to
</span><span class="cx"> $contents = '';
</span><span class="cx">
</span><span class="lines">@@ -117,10 +124,16 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // The FTP class uses string functions internally during file download/upload
+ mbstring_binary_safe_encoding();
+
</ins><span class="cx"> $bytes_written = fwrite( $temphandle, $contents );
</span><span class="cx"> if ( false === $bytes_written || $bytes_written != strlen( $contents ) ) {
</span><span class="cx"> fclose( $temphandle );
</span><span class="cx"> unlink( $temp );
</span><ins>+
+ reset_mbstring_encoding();
+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -128,6 +141,8 @@
</span><span class="cx">
</span><span class="cx"> $ret = $this->ftp->fput($file, $temphandle);
</span><span class="cx">
</span><ins>+ reset_mbstring_encoding();
+
</ins><span class="cx"> fclose($temphandle);
</span><span class="cx"> unlink($temp);
</span><span class="cx">
</span><span class="lines">@@ -293,9 +308,15 @@
</span><span class="cx"> $limit_file = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ mbstring_binary_safe_encoding();
+
</ins><span class="cx"> $list = $this->ftp->dirlist($path);
</span><del>- if ( empty($list) && !$this->exists($path) )
</del><ins>+ if ( empty( $list ) && ! $this->exists( $path ) ) {
+
+ reset_mbstring_encoding();
+
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $ret = array();
</span><span class="cx"> foreach ( $list as $struc ) {
</span><span class="lines">@@ -322,6 +343,9 @@
</span><span class="cx">
</span><span class="cx"> $ret[ $struc['name'] ] = $struc;
</span><span class="cx"> }
</span><ins>+
+ reset_mbstring_encoding();
+
</ins><span class="cx"> return $ret;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>