Changeset 12848

Timestamp:

01/26/2010 06:39:12 PM (16 years ago)

Author:

ryan

Message:

Remove fix_actve_plugins(). Props hakre. fixes #11750

Location:

trunk

Files:

• wp-admin/includes/plugin.php (modified) (4 diffs)
• wp-admin/plugin-editor.php (modified) (1 diff)
• wp-admin/plugins.php (modified) (2 diffs)
• wp-includes/load.php (modified) (1 diff)
• wp-includes/ms-deprecated.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (2 diffs)
• wp-includes/update.php (modified) (2 diffs)

trunk/wp-admin/includes/plugin.php

@@ -259 +259 @@
  * @return bool True, if in the active plugins list. False, not in the list.
  */
-function is_plugin_active($plugin) {
-    return in_array( $plugin, apply_filters( 'active_plugins', get_option( 'active_plugins' ) ) );
+function is_plugin_active( $plugin ) {
+    return in_array( $plugin, apply_filters( 'active_plugins', get_option( 'active_plugins', array() ) ) );
 }
 
@@ -287 +287 @@
  * @return WP_Error|null WP_Error on invalid file or null on success.
  */
-function activate_plugin($plugin, $redirect = '') {
-    $current = get_option('active_plugins');
-    $plugin = plugin_basename(trim($plugin));
+function activate_plugin( $plugin, $redirect = '' ) {
+    $current = get_option( 'active_plugins', array() );
+    $plugin  = plugin_basename( trim( $plugin ) );
 
     $valid = validate_plugin($plugin);
@@ -323 +323 @@
  * @param bool $silent Optional, default is false. Prevent calling deactivate hook.
  */
-function deactivate_plugins($plugins, $silent= false) {
-    $current = get_option('active_plugins');
-
-    if ( !is_array($plugins) )
-        $plugins = array($plugins);
-
-    foreach ( $plugins as $plugin ) {
+function deactivate_plugins( $plugins, $silent = false ) {
+    $current = get_option( 'active_plugins', array() );
+
+    foreach ( (array) $plugins as $plugin ) {
         $plugin = plugin_basename($plugin);
         if ( ! is_plugin_active($plugin) )
@@ -476 +473 @@
 }
 
+/**
+ * validate active plugins
+ * 
+ * validate all active plugins, deactivates invalid and 
+ * returns an array of deactived ones.
+ * 
+ * @since unknown
+ * @return array invalid plugins, plugin as key, error as value
+ */
 function validate_active_plugins() {
-    $check_plugins = apply_filters( 'active_plugins', get_option('active_plugins') );
-
-    // Sanity check.  If the active plugin list is not an array, make it an
-    // empty array.
-    if ( !is_array($check_plugins) ) {
+    $plugins = apply_filters( 'active_plugins', get_option( 'active_plugins', array() ) );
+
+    // validate vartype: array
+    if ( !is_array( $plugins ) ) {
         update_option('active_plugins', array());
         return;
     }
 
-    //Invalid is any plugin that is deactivated due to error.
     $invalid = array();
 
-    // If a plugin file does not exist, remove it from the list of active
-    // plugins.
-    foreach ( $check_plugins as $check_plugin ) {
-        $result = validate_plugin($check_plugin);
+    // invalid plugins get deactivated
+    foreach ( $plugins as $plugin ) {
+        $result = validate_plugin( $plugin );
         if ( is_wp_error( $result ) ) {
-            $invalid[$check_plugin] = $result;
-            deactivate_plugins( $check_plugin, true);
+            $invalid[$plugin] = $result;
+            deactivate_plugins( $plugin, true );
         }
     }

trunk/wp-admin/plugin-editor.php

@@ -209 +209 @@
         <?php endif; ?>
 <?php if ( is_writeable($real_file) ) : ?>
-    <?php if ( in_array($file, (array) get_option('active_plugins')) ) { ?>
+    <?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?>
         <p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended.  If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
     <?php } ?>

trunk/wp-admin/plugins.php

@@ -114 +114 @@
             require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
             require_once( 'admin-header.php' );
-            
+
             $url = 'plugins.php?action=upgrade-selected&plugins=' . urlencode( join( ',', $plugins ) );
             $title = __( 'Upgrade Plugins' );
@@ -284 +284 @@
 if ( is_multisite() && is_super_admin() ) {
     $menu_perms = get_site_option('menu_items', array());
-    if ( !$menu_perms['plugins'] ) {
+    if ( empty($menu_perms['plugins']) )
         add_action( 'admin_notices', '_admin_notice_multisite_activate_plugins_page' );
-    }
+    unset($menu_perms);
 }
 

trunk/wp-includes/load.php

@@ -405 +405 @@
             $plugins[] = ABSPATH . 'my-hacks.php';
 
-    $active_plugins = apply_filters( 'active_plugins', get_option( 'active_plugins' ) );
+    $active_plugins = apply_filters( 'active_plugins', get_option( 'active_plugins', array() ) );
     if ( !is_array( $active_plugins ) || defined( 'WP_INSTALLING' ) )
         return $plugins;

trunk/wp-includes/ms-deprecated.php

@@ -111 +111 @@
 }
 
+/**
+ * @deprecated 3.0
+ */
+function clear_global_post_cache( $post_id ) {
+    _deprecated_function( __FUNCTION__, '3.0', 'clean_post_cache' );
+}
+
 ?>

trunk/wp-includes/ms-functions.php

@@ -726 +726 @@
 }
 
-// deprecated, see clean_post_cache()
-function clear_global_post_cache( $post_id ) {
-    return;
-}
-
 function add_user_to_blog( $blog_id, $user_id, $role ) {
     switch_to_blog($blog_id);
@@ -1987 +1982 @@
 }
 
-function fix_active_plugins( $value ) {
-    if ( false == is_array( $value ) )
-        $value = array();
-    return $value;
-}
-add_filter( "option_active_plugins", "fix_active_plugins" );
-
 if ( !function_exists('rss_gc') ) :
 function rss_gc() {

trunk/wp-includes/update.php

@@ -113 +113 @@
 
     $plugins = get_plugins();
-    $active  = get_option( 'active_plugins' );
+    $active  = get_option( 'active_plugins', array() );
     $current = get_site_transient( 'update_plugins' );
     if ( ! is_object($current) )
@@ -148 +148 @@
     set_site_transient( 'update_plugins', $current );
 
-    $to_send = (object)compact('plugins', 'active');
+    $to_send = (object) compact('plugins', 'active');
 
     $options = array(