WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up repetitive string. fixes #11850, props scribu 

git-svn-id: http://svn.automattic.com/wordpress/trunk@13477 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-02-28 01:31:54 +00:00
parent 206f886d54
commit 7fa2cac615
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/plugins.php
View File

@ -232,12 +232,12 @@ if ( !empty($action) ) {
$plugin_info[ $plugin ]['is_uninstallable'] = is_uninstallable_plugin( $plugin ); $plugin_info[ $plugin ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
} }
} else { } else {
//Locate all the files in that folder: // Locate all the files in that folder
$files = list_files( WP_PLUGIN_DIR . '/' . dirname($plugin) ); $files = list_files( WP_PLUGIN_DIR . '/' . dirname($plugin) );
if ( $files ) { if ( $files ) {
$files_to_delete = array_merge($files_to_delete, $files); $files_to_delete = array_merge($files_to_delete, $files);
} }
//Get plugins list from that folder // Get plugins list from that folder
if ( $folder_plugins = get_plugins( '/' . dirname($plugin)) ) { if ( $folder_plugins = get_plugins( '/' . dirname($plugin)) ) {
foreach( $folder_plugins as $plugin_file => $data ) { foreach( $folder_plugins as $plugin_file => $data ) {
$plugin_info[ $plugin_file ] = $data; $plugin_info[ $plugin_file ] = $data;
@ -250,7 +250,7 @@ if ( !empty($action) ) {
$plugins_to_delete = count( $plugin_info ); $plugins_to_delete = count( $plugin_info );
echo '<h2>' . _n( 'Delete Plugin', 'Delete Plugins', $plugins_to_delete ) . '</h2>'; echo '<h2>' . _n( 'Delete Plugin', 'Delete Plugins', $plugins_to_delete ) . '</h2>';
?> ?>
<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> <p><?php echo _n( 'You are about to remove the following plugin:', 'You are about to remove the following plugins:', $plugins_to_delete ); ?></p>
<ul class="ul-disc"> <ul class="ul-disc">
<?php <?php
$data_to_delete = false; $data_to_delete = false;