Index: wp-admin/plugins.php =================================================================== --- wp-admin/plugins.php (revision 12716) +++ wp-admin/plugins.php (working copy) @@ -27,7 +27,7 @@ if ( empty($default_status) ) $default_status = 'all'; $status = isset($_REQUEST['plugin_status']) ? $_REQUEST['plugin_status'] : $default_status; -if ( !in_array($status, array('all', 'active', 'inactive', 'recent', 'upgrade', 'search')) ) +if ( !in_array($status, array('all', 'active', 'inactive', 'recent', 'upgrade', 'search', 'advanced')) ) $status = 'all'; if ( $status != $default_status && 'search' != $status ) update_usermeta($current_user->ID, 'plugins_last_view', $status); @@ -287,6 +287,7 @@ $plugin_data) { + //Translate, Apply Markup, Sanitize HTML + $plugin_data = _get_plugin_data_markup_translate($plugin_file, $plugin_data, false, true); + $advanced_plugins[ $plugin_file ] = $plugin_data; +} + $total_all_plugins = count($all_plugins); +$total_advanced_plugins = count($advanced_plugins); $total_inactive_plugins = count($inactive_plugins); $total_active_plugins = count($active_plugins); $total_recent_plugins = count($recent_plugins); @@ -391,11 +399,15 @@ */ function print_plugins_table($plugins, $context = '') { global $page; + if ( empty( $plugins ) ) { + echo '

' . __('No plugins to show') . '

'; + return; + } ?> - + @@ -403,7 +415,7 @@ - + @@ -411,34 +423,32 @@ - - '; - } foreach ( (array)$plugins as $plugin_file => $plugin_data) { $actions = array(); - $is_active = is_plugin_active($plugin_file); + if ( 'advanced' == $context ) { + $is_active = true; + } else { + $is_active = is_plugin_active($plugin_file); - if ( $is_active ) - $actions[] = '' . __('Deactivate') . ''; - else - $actions[] = '' . __('Activate') . ''; + if ( $is_active ) + $actions[] = '' . __('Deactivate') . ''; + else + $actions[] = '' . __('Activate') . ''; - if ( current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) ) - $actions[] = '' . __('Edit') . ''; + if ( current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) ) + $actions[] = '' . __('Edit') . ''; - if ( ! $is_active && current_user_can('delete_plugins') ) - $actions[] = '' . __('Delete') . ''; + if ( ! $is_active && current_user_can('delete_plugins') ) + $actions[] = '' . __('Delete') . ''; - $actions = apply_filters( 'plugin_action_links', $actions, $plugin_file, $plugin_data, $context ); - $actions = apply_filters( "plugin_action_links_$plugin_file", $actions, $plugin_file, $plugin_data, $context ); + $actions = apply_filters( 'plugin_action_links', $actions, $plugin_file, $plugin_data, $context ); + $actions = apply_filters( "plugin_action_links_$plugin_file", $actions, $plugin_file, $plugin_data, $context ); + } $action_count = count($actions); $class = $is_active ? 'active' : 'inactive'; echo " - + @@ -546,37 +556,42 @@ $term = isset($_REQUEST['s']) ? urlencode(stripslashes($_REQUEST['s'])) : ''; $status_links[] = "
  • " . sprintf( _n( 'Search Results (%s)', 'Search Results (%s)', $total_search_plugins ), number_format_i18n( $total_search_plugins ) ) . ''; } +if ( ! empty($advanced_plugins) ) { + $class = ( 'advanced' == $status ) ? ' class="current"' : ''; + $status_links[] = "
  • " . sprintf( _n( 'Advanced Plugins (%s)', 'Advanced Plugins (%s)', $total_advanced_plugins ), number_format_i18n( $total_advanced_plugins ) ) . ''; +} echo implode( " |
    • \n", $status_links ) . ''; unset( $status_links ); ?> - +
    +' . __('Must-Use Plugins') . ''; + echo '

    ' . __('Files in the wp-content/mu-plugins directory are executed automatically.') . '

    '; +} +if ( $page_links && 'advanced' != $status ) : ?>
    -', $page_links_text, '
    '; - -print_plugin_actions($status); -?> +
    +
    - $plugins_per_page ) $plugins = array_slice($plugins, $start, $plugins_per_page); print_plugins_table($plugins, $status); -?> + +if ( $page_links && 'advanced' != $status ) : ?>
    -$page_links_text
    "; - -print_plugin_actions($status, "action2"); -?> +
    + + - +

    Index: wp-admin/includes/plugin.php =================================================================== --- wp-admin/includes/plugin.php (revision 12716) +++ wp-admin/includes/plugin.php (working copy) @@ -251,6 +251,54 @@ } /** + * Check the mu-plugins directory and retrieve all mu-plugin files with any plugin data. + * + * WordPress only includes mu-plugin files in the base mu-plugins directory (wp-content/mu-plugins). + * + * @since 3.0.0 + * @return array Key is the mu-plugin file path and the value is an array of the mu-plugin data. + */ +function get_mu_plugins() { + + $wp_plugins = array (); + // Files in wp-content/mu-plugins directory + $plugin_files = array(); + + if ( ! is_dir( WPMU_PLUGIN_DIR ) ) + return $wp_plugins; + if ( $plugins_dir = @ opendir( WPMU_PLUGIN_DIR ) ) { + while ( ( $file = readdir( $plugins_dir ) ) !== false ) { + if ( substr( $file, -4 ) == '.php' ) + $plugin_files[] = $file; + } + } + + @closedir( $plugins_dir ); + + if ( !$plugins_dir || empty($plugin_files) ) + return $wp_plugins; + + foreach ( $plugin_files as $plugin_file ) { + if ( !is_readable( WPMU_PLUGIN_DIR . "/$plugin_file" ) ) + continue; + + $plugin_data = get_plugin_data( WPMU_PLUGIN_DIR . "/$plugin_file", false, false ); //Do not apply markup/translate as it'll be cached. + + if ( empty ( $plugin_data['Name'] ) ) + $plugin_data['Name'] = $plugin_file; + + $wp_plugins[ $plugin_file ] = $plugin_data; + } + + if ( isset( $wp_plugins['index.php'] ) && filesize( WPMU_PLUGIN_DIR . '/index.php') <= 30 ) // silence is golden + unset( $wp_plugins['index.php'] ); + + uasort( $wp_plugins, create_function( '$a, $b', 'return strnatcasecmp( $a["Name"], $b["Name"] );' )); + + return $wp_plugins; +} + +/** * Check whether the plugin is active by checking the active_plugins list. * * @since 2.5.0
    ' . __('No plugins to show') . '
    " . ( 'advanced' != $context ? "" : '' ) . " {$plugin_data['Name']}

    {$plugin_data['Description']}