<!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>[13477] trunk/wp-admin/plugins.php: Clean up repetitive string.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13477">13477</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-28 01:31:54 +0000 (Sun, 28 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up repetitive string. fixes <a href="http://trac.wordpress.org/ticket/11850">#11850</a>, props scribu</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (13476 => 13477)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-02-28 00:12:43 UTC (rev 13476)
+++ trunk/wp-admin/plugins.php 2010-02-28 01:31:54 UTC (rev 13477)
</span><span class="lines">@@ -232,12 +232,12 @@
</span><span class="cx"> $plugin_info[ $plugin ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- //Locate all the files in that folder:
</del><ins>+ // Locate all the files in that folder
</ins><span class="cx"> $files = list_files( WP_PLUGIN_DIR . '/' . dirname($plugin) );
</span><span class="cx"> if ( $files ) {
</span><span class="cx"> $files_to_delete = array_merge($files_to_delete, $files);
</span><span class="cx"> }
</span><del>- //Get plugins list from that folder
</del><ins>+ // Get plugins list from that folder
</ins><span class="cx"> if ( $folder_plugins = get_plugins( '/' . dirname($plugin)) ) {
</span><span class="cx"> foreach( $folder_plugins as $plugin_file => $data ) {
</span><span class="cx"> $plugin_info[ $plugin_file ] = $data;
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> $plugins_to_delete = count( $plugin_info );
</span><span class="cx"> echo '<h2>' . _n( 'Delete Plugin', 'Delete Plugins', $plugins_to_delete ) . '</h2>';
</span><span class="cx"> ?>
</span><del>- <p><?php echo _n( 'Deleting the selected plugin will remove the following plugin and its files:', 'Deleting the selected plugins will remove the following plugins and their files:', $plugins_to_delete ); ?></p>
</del><ins>+ <p><?php echo _n( 'You are about to remove the following plugin:', 'You are about to remove the following plugins:', $plugins_to_delete ); ?></p>
</ins><span class="cx"> <ul class="ul-disc">
</span><span class="cx"> <?php
</span><span class="cx"> $data_to_delete = false;
</span></span></pre>
</div>
</div>
</body>
</html>