diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-26 12:57:25 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-26 12:57:25 +0000 |
| commit | 8a8560c1b75ce5cb9f3b86bf3cba19c6df5000ff (patch) | |
| tree | 9a697c0c3029c2b7a5223d818398c562346921e3 /wp-admin/plugins.php | |
| parent | c794c54fc14d1a4af6101ace58f8e60da2dc7d98 (diff) | |
| download | wordpress-mu-8a8560c1b75ce5cb9f3b86bf3cba19c6df5000ff.tar.gz wordpress-mu-8a8560c1b75ce5cb9f3b86bf3cba19c6df5000ff.tar.xz wordpress-mu-8a8560c1b75ce5cb9f3b86bf3cba19c6df5000ff.zip | |
WP Merge to rev 4813
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@868 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/plugins.php')
| -rw-r--r-- | wp-admin/plugins.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 2889b13..bd80c2e 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -18,13 +18,14 @@ if ( isset($_GET['action']) ) { if ( ! file_exists(ABSPATH . PLUGINDIR . '/' . $plugin) ) wp_die(__('Plugin file does not exist.')); if (!in_array($plugin, $current)) { + wp_redirect('plugins.php?error=true'); // we'll override this later if the plugin can be included without fatal error + @include(ABSPATH . PLUGINDIR . '/' . $plugin); $current[] = $plugin; sort($current); update_option('active_plugins', $current); - include(ABSPATH . PLUGINDIR . '/' . $plugin); do_action('activate_' . $plugin); } - wp_redirect('plugins.php?activate=true'); + wp_redirect('plugins.php?activate=true'); // overrides the ?error=true one above } else if ('deactivate' == $_GET['action']) { check_admin_referer('deactivate-plugin_' . $_GET['plugin']); $current = get_option('active_plugins'); @@ -65,13 +66,12 @@ foreach ($check_plugins as $check_plugin) { } ?> -<?php if (isset($_GET['activate'])) : ?> -<div id="message" class="updated fade"><p><?php _e('Plugin <strong>activated</strong>.') ?></p> -</div> -<?php endif; ?> -<?php if (isset($_GET['deactivate'])) : ?> -<div id="message" class="updated fade"><p><?php _e('Plugin <strong>deactivated</strong>.') ?></p> -</div> +<?php if ( isset($_GET['error']) ) : ?> + <div id="message" class="updated fade"><p><?php _e('Plugin could not be activated because it triggered a <strong>fatal error</strong>.') ?></p></div> +<?php elseif ( isset($_GET['activate']) ) : ?> + <div id="message" class="updated fade"><p><?php _e('Plugin <strong>activated</strong>.') ?></p></div> +<?php elseif ( isset($_GET['deactivate']) ) : ?> + <div id="message" class="updated fade"><p><?php _e('Plugin <strong>deactivated</strong>.') ?></p></div> <?php endif; ?> <div class="wrap"> |