<!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>[13470] trunk/wp-admin/plugins.php: When deleting plugins,
check for uninstall hooks and warn of data deletion.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13470">13470</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-27 22:01:22 +0000 (Sat, 27 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>When deleting plugins, check for uninstall hooks and warn of data deletion. Props cyberhobo. Pluralize some string(s). fixes <a href="http://trac.wordpress.org/ticket/11850">#11850</a></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 (13469 => 13470)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-02-27 20:26:37 UTC (rev 13469)
+++ trunk/wp-admin/plugins.php 2010-02-27 22:01:22 UTC (rev 13470)
</span><span class="lines">@@ -222,14 +222,15 @@
</span><span class="cx"> require_once('admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>- <h2><?php _e('Delete Plugin(s)'); ?></h2>
</del><span class="cx"> <?php
</span><span class="cx"> $files_to_delete = $plugin_info = array();
</span><span class="cx"> foreach ( (array) $plugins as $plugin ) {
</span><span class="cx"> if ( '.' == dirname($plugin) ) {
</span><span class="cx"> $files_to_delete[] = WP_PLUGIN_DIR . '/' . $plugin;
</span><del>- if ( $data = get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin) )
</del><ins>+ if( $data = get_plugin_data(WP_PLUGIN_DIR . '/' . $plugin) ) {
</ins><span class="cx"> $plugin_info[ $plugin ] = $data;
</span><ins>+ $plugin_info[ $plugin ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> //Locate all the files in that folder:
</span><span class="cx"> $files = list_files( WP_PLUGIN_DIR . '/' . dirname($plugin) );
</span><span class="lines">@@ -237,20 +238,40 @@
</span><span class="cx"> $files_to_delete = array_merge($files_to_delete, $files);
</span><span class="cx"> }
</span><span class="cx"> //Get plugins list from that folder
</span><del>- if ( $folder_plugins = get_plugins( '/' . dirname($plugin)) )
- $plugin_info = array_merge($plugin_info, $folder_plugins);
</del><ins>+ if ( $folder_plugins = get_plugins( '/' . dirname($plugin)) ) {
+ foreach( $folder_plugins as $plugin_file => $data ) {
+ $plugin_info[ $plugin_file ] = $data;
+ $plugin_info[ $plugin_file ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ screen_icon();
+ $plugins_to_delete = count( $plugin_info );
+ echo '<h2>' . _n( 'Delete Plugin', 'Delete Plugins', $plugins_to_delete ) . '</h2>';
</ins><span class="cx"> ?>
</span><del>- <p><?php _e('Deleting the selected plugins will remove the following plugin(s) and their files:'); ?></p>
</del><ins>+ <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>
</ins><span class="cx"> <ul class="ul-disc">
</span><span class="cx"> <?php
</span><del>- foreach ( $plugin_info as $plugin )
- /* translators: 1: plugin name, 2: plugin author */
- echo '<li>', sprintf(__('<strong>%1$s</strong> by <em>%2$s</em>'), $plugin['Name'], $plugin['Author']), '</li>';
</del><ins>+ $data_to_delete = false;
+ foreach ( $plugin_info as $plugin ) {
+ if ( $plugin['is_uninstallable'] ) {
+ /* translators: 1: plugin name, 2: plugin author */
+ echo '<li>', sprintf( __( '<strong>%1$s</strong> by <em>%2$s</em> (will also <strong>delete its data</strong>)' ), $plugin['Name'], $plugin['Author'] ), '</li>';
+ $data_to_delete = true;
+ } else {
+ /* translators: 1: plugin name, 2: plugin author */
+ echo '<li>', sprintf( __('<strong>%1$s</strong> by <em>%2$s</em>' ), $plugin['Name'], $plugin['Author'] ), '</li>';
+ }
+ }
</ins><span class="cx"> ?>
</span><span class="cx"> </ul>
</span><del>- <p><?php _e('Are you sure you wish to delete these files?') ?></p>
</del><ins>+ <p><?php
+ if ( $data_to_delete )
+ _e('Are you sure you wish to delete these files and data?');
+ else
+ _e('Are you sure you wish to delete these files?');
+ ?></p>
</ins><span class="cx"> <form method="post" action="<?php echo esc_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
</span><span class="cx"> <input type="hidden" name="verify-delete" value="1" />
</span><span class="cx"> <input type="hidden" name="action" value="delete-selected" />
</span><span class="lines">@@ -259,7 +280,7 @@
</span><span class="cx"> echo '<input type="hidden" name="checked[]" value="' . esc_attr($plugin) . '" />';
</span><span class="cx"> ?>
</span><span class="cx"> <?php wp_nonce_field('bulk-manage-plugins') ?>
</span><del>- <input type="submit" name="submit" value="<?php esc_attr_e('Yes, Delete these files') ?>" class="button" />
</del><ins>+ <input type="submit" name="submit" value="<?php $data_to_delete ? esc_attr_e('Yes, Delete these files and data') : esc_attr_e('Yes, Delete these files') ?>" class="button" />
</ins><span class="cx"> </form>
</span><span class="cx"> <form method="post" action="<?php echo esc_url(wp_get_referer()); ?>" style="display:inline;">
</span><span class="cx"> <input type="submit" name="submit" value="<?php esc_attr_e('No, Return me to the plugin list') ?>" class="button" />
</span></span></pre>
</div>
</div>
</body>
</html>