Changeset 11005 for trunk/wp-admin/includes/plugin.php

Timestamp:

04/19/2009 07:36:28 PM (15 years ago)

Author:

ryan

Message:

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

File:

• trunk/wp-admin/includes/plugin.php (modified) (3 diffs)

trunk/wp-admin/includes/plugin.php

@@ -217 +217 @@
     // Files in wp-content/plugins directory
     $plugins_dir = @ opendir( $plugin_root);
+    $plugin_files = array();
     if ( $plugins_dir ) {
         while (($file = readdir( $plugins_dir ) ) !== false ) {
@@ -240 +241 @@
     @closedir( $plugins_subdir );
 
-    if ( !$plugins_dir || !$plugin_files )
+    if ( !$plugins_dir || empty($plugin_files) )
         return $wp_plugins;
 
@@ -433 +434 @@
     }
 
-    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);