<!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>[14349] trunk/wp-admin/includes/file.php:
Skip over __MACOSX folders during zip extraction.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14349">14349</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-05-02 23:24:36 +0000 (Sun, 02 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Skip over __MACOSX folders during zip extraction. Props chrisbliss18. Fixes <a href="http://trac.wordpress.org/ticket/12637">#12637</a></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 (14348 => 14349)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2010-05-02 22:57:44 UTC (rev 14348)
+++ trunk/wp-admin/includes/file.php 2010-05-02 23:24:36 UTC (rev 14349)
</span><span class="lines">@@ -503,7 +503,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Unzip's a specified ZIP file to a location on the Filesystem via the WordPress Filesystem Abstraction.
</span><del>- * Assumes that WP_Filesystem() has already been called and set up.
</del><ins>+ * Assumes that WP_Filesystem() has already been called and set up. Does not extract a root-level __MACOSX directory, if present.
</ins><span class="cx"> *
</span><span class="cx"> * Attempts to increase the PHP Memory limit to 256M before uncompressing,
</span><span class="cx"> * However, The most memory required shouldn't be much larger than the Archive itself.
</span><span class="lines">@@ -584,6 +584,9 @@
</span><span class="cx"> if ( ! $info = $z->statIndex($i) )
</span><span class="cx"> return new WP_Error('stat_failed', __('Could not retrieve file from archive.'));
</span><span class="cx">
</span><ins>+ if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+ continue;
+
</ins><span class="cx"> if ( '/' == substr($info['name'], -1) ) // directory
</span><span class="cx"> $needed_dirs[] = $to . untrailingslashit($info['name']);
</span><span class="cx"> else
</span><span class="lines">@@ -607,6 +610,9 @@
</span><span class="cx"> if ( '/' == substr($info['name'], -1) ) // directory
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+ if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+ continue;
+
</ins><span class="cx"> $contents = $z->getFromIndex($i);
</span><span class="cx"> if ( false === $contents )
</span><span class="cx"> return new WP_Error('extract_failed', __('Could not extract file from archive.'), $info['name']);
</span><span class="lines">@@ -648,8 +654,12 @@
</span><span class="cx"> return new WP_Error('empty_archive', __('Empty archive.'));
</span><span class="cx">
</span><span class="cx"> // Determine any children directories needed (From within the archive)
</span><del>- foreach ( $archive_files as $file )
</del><ins>+ foreach ( $archive_files as $file ) {
+ if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory
+ continue;
+
</ins><span class="cx"> $needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname($file['filename']) );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $needed_dirs = array_unique($needed_dirs);
</span><span class="cx"> asort($needed_dirs);
</span><span class="lines">@@ -666,6 +676,9 @@
</span><span class="cx"> if ( $file['folder'] )
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+ if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
+ continue;
+
</ins><span class="cx"> if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
</span><span class="cx"> return new WP_Error('copy_failed', __('Could not copy file.'), $to . $file['filename']);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>