<!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>[24313] trunk/wp-admin/includes/class-wp-upgrader.php: Add more specific error messages when upgrading themes and plugins and the package cannot be extracted (no files), props SergeyBiryukov, fixes #24223</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/24313">24313</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-05-22 16:57:20 +0000 (Wed, 22 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add more specific error messages when upgrading themes and plugins and the package cannot be extracted (no files), props SergeyBiryukov, fixes <a href="http://core.trac.wordpress.org/ticket/24223">#24223</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (24312 => 24313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2013-05-22 02:58:58 UTC (rev 24312)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2013-05-22 16:57:20 UTC (rev 24313)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx">
</span><span class="cx"> $this->strings['download_failed'] = __('Download failed.');
</span><span class="cx"> $this->strings['installing_package'] = __('Installing the latest version…');
</span><ins>+ $this->strings['no_files'] = __('The package contains no files.');
</ins><span class="cx"> $this->strings['folder_exists'] = __('Destination folder already exists.');
</span><span class="cx"> $this->strings['mkdir_failed'] = __('Could not create directory.');
</span><span class="cx"> $this->strings['incompatible_archive'] = __('The package could not be installed.');
</span><span class="lines">@@ -194,7 +195,7 @@
</span><span class="cx"> if ( 1 == count($source_files) && $wp_filesystem->is_dir( trailingslashit($source) . $source_files[0] . '/') ) //Only one folder? Then we want its contents.
</span><span class="cx"> $source = trailingslashit($source) . trailingslashit($source_files[0]);
</span><span class="cx"> elseif ( count($source_files) == 0 )
</span><del>- return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __( 'The plugin contains no files.' ) ); //There are no files?
</del><ins>+ return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], $this->strings['no_files'] ); //There are no files?
</ins><span class="cx"> else //It's only a single file, the upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename.
</span><span class="cx"> $source = trailingslashit($source);
</span><span class="cx">
</span><span class="lines">@@ -388,6 +389,7 @@
</span><span class="cx"> $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>…');
</span><span class="cx"> $this->strings['unpack_package'] = __('Unpacking the package…');
</span><span class="cx"> $this->strings['installing_package'] = __('Installing the plugin…');
</span><ins>+ $this->strings['no_files'] = __('The plugin contains no files.');
</ins><span class="cx"> $this->strings['process_failed'] = __('Plugin install failed.');
</span><span class="cx"> $this->strings['process_success'] = __('Plugin installed successfully.');
</span><span class="cx"> }
</span><span class="lines">@@ -667,6 +669,7 @@
</span><span class="cx"> $this->strings['downloading_package'] = __('Downloading install package from <span class="code">%s</span>…');
</span><span class="cx"> $this->strings['unpack_package'] = __('Unpacking the package…');
</span><span class="cx"> $this->strings['installing_package'] = __('Installing the theme…');
</span><ins>+ $this->strings['no_files'] = __('The theme contains no files.');
</ins><span class="cx"> $this->strings['process_failed'] = __('Theme install failed.');
</span><span class="cx"> $this->strings['process_success'] = __('Theme installed successfully.');
</span><span class="cx"> /* translators: 1: theme name, 2: version */
</span><span class="lines">@@ -1239,7 +1242,7 @@
</span><span class="cx">
</span><span class="cx"> function add_strings() {
</span><span class="cx"> $this->upgrader->strings['skin_upgrade_start'] = __('The update process is starting. This process may take a while on some hosts, so please be patient.');
</span><del>- $this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: <strong>%2$s</strong>.');
</del><ins>+ $this->upgrader->strings['skin_update_failed_error'] = __('An error occurred while updating %1$s: <strong>%2$s</strong>');
</ins><span class="cx"> $this->upgrader->strings['skin_update_failed'] = __('The update of %1$s failed.');
</span><span class="cx"> $this->upgrader->strings['skin_update_successful'] = __('%1$s updated successfully.').' <a onclick="%2$s" href="#" class="hide-if-no-js"><span>'.__('Show Details').'</span><span class="hidden">'.__('Hide Details').'</span>.</a>';
</span><span class="cx"> $this->upgrader->strings['skin_upgrade_end'] = __('All updates have been completed.');
</span></span></pre>
</div>
</div>
</body>
</html>