<!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>[20786] trunk/wp-admin/includes/class-wp-upgrader.php: Remove activate/deactivate messages from plugin upgrades.</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, #logmsg > ol { margin-left: 0; 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/20786">20786</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-05-14 17:24:44 +0000 (Mon, 14 May 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove activate/deactivate messages from plugin upgrades. Props toppa. fixes <a href="http://core.trac.wordpress.org/ticket/17833">#17833</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 (20785 => 20786)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php        2012-05-14 17:01:35 UTC (rev 20785)
+++ trunk/wp-admin/includes/class-wp-upgrader.php        2012-05-14 17:24:44 UTC (rev 20786)
</span><span class="lines">@@ -374,7 +374,6 @@
</span><span class="cx">                 $this-&gt;strings['no_package'] = __('Update package not available.');
</span><span class="cx">                 $this-&gt;strings['downloading_package'] = __('Downloading update from &lt;span class=&quot;code&quot;&gt;%s&lt;/span&gt;&amp;#8230;');
</span><span class="cx">                 $this-&gt;strings['unpack_package'] = __('Unpacking the update&amp;#8230;');
</span><del>-                $this-&gt;strings['deactivate_plugin'] = __('Deactivating the plugin&amp;#8230;');
</del><span class="cx">                 $this-&gt;strings['remove_old'] = __('Removing the old version of the plugin&amp;#8230;');
</span><span class="cx">                 $this-&gt;strings['remove_old_failed'] = __('Could not remove the old plugin.');
</span><span class="cx">                 $this-&gt;strings['process_failed'] = __('Plugin update failed.');
</span><span class="lines">@@ -597,7 +596,6 @@
</span><span class="cx">                         return new WP_Error('bad_request', $this-&gt;strings['bad_request']);
</span><span class="cx"> 
</span><span class="cx">                 if ( is_plugin_active($plugin) ) {
</span><del>-                        $this-&gt;skin-&gt;feedback('deactivate_plugin');
</del><span class="cx">                         //Deactivate the plugin silently, Prevent deactivation hooks from running.
</span><span class="cx">                         deactivate_plugins($plugin, true);
</span><span class="cx">                 }
</span><span class="lines">@@ -1198,7 +1196,6 @@
</span><span class="cx">         function after() {
</span><span class="cx">                 $this-&gt;plugin = $this-&gt;upgrader-&gt;plugin_info();
</span><span class="cx">                 if ( !empty($this-&gt;plugin) &amp;&amp; !is_wp_error($this-&gt;result) &amp;&amp; $this-&gt;plugin_active ){
</span><del>-                        show_message(__('Reactivating the plugin&amp;#8230;'));
</del><span class="cx">                         echo '&lt;iframe style=&quot;border:0;overflow:hidden&quot; width=&quot;100%&quot; height=&quot;170px&quot; src=&quot;' . wp_nonce_url('update.php?action=activate-plugin&amp;networkwide=' . $this-&gt;plugin_network_active . '&amp;plugin=' . $this-&gt;plugin, 'activate-plugin_' . $this-&gt;plugin) .'&quot;&gt;&lt;/iframe&gt;';
</span><span class="cx">                 }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>