vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 20:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

consolidate plugin/theme/core upgrade/install functions. Props DD32. see #7875

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@11005 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2009-04-19 19:36:28 +00:00
parent cff07d7f0d
commit 603fba4ad4
13 changed files with 1176 additions and 1182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-admin/includes/plugin.php
+3 -6
View File
@@ -216,6 +216,7 @@ function get_plugins($plugin_folder = '') {
// Files in wp-content/plugins directory
$plugins_dir = @ opendir( $plugin_root);
$plugin_files = array();
if ( $plugins_dir ) {
while (($file = readdir( $plugins_dir ) ) !== false ) {
if ( substr($file, 0, 1) == '.' )
@@ -239,7 +240,7 @@ function get_plugins($plugin_folder = '') {
@closedir( $plugins_dir );
@closedir( $plugins_subdir );
if ( !$plugins_dir || !$plugin_files )
if ( !$plugins_dir || empty($plugin_files) )
return $wp_plugins;
foreach ( $plugin_files as $plugin_file ) {
@@ -432,14 +433,10 @@ function delete_plugins($plugins, $redirect = '' ) {
return;
}
if ( $wp_filesystem->errors->get_error_code() ) {
return $wp_filesystem->errors;
}
if ( ! is_object($wp_filesystem) )
return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
if ( $wp_filesystem->errors->get_error_code() )
if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
//Get the base plugin folder