WP Merge to rev #4147

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@729 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 6 insertions, 6 deletions

diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index c5bef8b..55f6bb5 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -11,7 +11,7 @@ if( $menu_perms[ 'plugins' ] != 1 )
 if ( isset($_GET['action']) ) {
 	if ('activate' == $_GET['action']) {
 		check_admin_referer('activate-plugin_' . $_GET['plugin']);
-		$current = get_settings('active_plugins');
+		$current = get_option('active_plugins');
 		if (!in_array($_GET['plugin'], $current)) {
 			$current[] = trim( $_GET['plugin'] );
 			sort($current);
@@ -22,7 +22,7 @@ if ( isset($_GET['action']) ) {
 		wp_redirect('plugins.php?activate=true');
 	} else if ('deactivate' == $_GET['action']) {
 		check_admin_referer('deactivate-plugin_' . $_GET['plugin']);
-		$current = get_settings('active_plugins');
+		$current = get_option('active_plugins');
 		array_splice($current, array_search( $_GET['plugin'], $current), 1 ); // Array-fu!
 		update_option('active_plugins', $current);
 		do_action('deactivate_' . trim( $_GET['plugin'] ));
@@ -37,7 +37,7 @@ require_once('admin-header.php');
 // Clean up options
 // If any plugins don't exist, axe 'em
 
-$check_plugins = get_settings('active_plugins');
+$check_plugins = get_option('active_plugins');
 
 // Sanity check.  If the active plugin list is not an array, make it an
 // empty array.
@@ -50,7 +50,7 @@ if ( !is_array($check_plugins) ) {
 // plugins.
 foreach ($check_plugins as $check_plugin) {
 	if (!file_exists(ABSPATH . 'wp-content/plugins/' . $check_plugin)) {
-			$current = get_settings('active_plugins');
+			$current = get_option('active_plugins');
 			$key = array_search($check_plugin, $current);
 			if ( false !== $key && NULL !== $key ) {
 				unset($current[$key]);
@@ -74,8 +74,8 @@ foreach ($check_plugins as $check_plugin) {
 <p><?php _e('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.'); ?></p>
 <?php
 
-if ( get_settings('active_plugins') )
-	$current_plugins = get_settings('active_plugins');
+if ( get_option('active_plugins') )
+	$current_plugins = get_option('active_plugins');
 
 $plugins = get_plugins();