diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-26 15:45:20 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-09-26 15:45:20 +0000 |
| commit | 28781ebb081ab8d99b30a33f5cd911b3b050bcc9 (patch) | |
| tree | f21e6b7d3dd06002c58dd52ae2eae10d64d62d85 /wp-admin/plugins.php | |
| parent | cbd939114d362bfece3839d7d5d5e07367fd6be8 (diff) | |
| download | wordpress-mu-28781ebb081ab8d99b30a33f5cd911b3b050bcc9.tar.gz wordpress-mu-28781ebb081ab8d99b30a33f5cd911b3b050bcc9.tar.xz wordpress-mu-28781ebb081ab8d99b30a33f5cd911b3b050bcc9.zip | |
WP Merge to rev 4254
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@770 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/plugins.php')
| -rw-r--r-- | wp-admin/plugins.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 55f6bb5..1be16fb 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -16,7 +16,7 @@ if ( isset($_GET['action']) ) { $current[] = trim( $_GET['plugin'] ); sort($current); update_option('active_plugins', $current); - include(ABSPATH . 'wp-content/plugins/' . trim( $_GET['plugin'] )); + include(ABSPATH . PLUGINDIR . '/' . trim( $_GET['plugin'] )); do_action('activate_' . trim( $_GET['plugin'] )); } wp_redirect('plugins.php?activate=true'); @@ -49,7 +49,7 @@ if ( !is_array($check_plugins) ) { // If a plugin file does not exist, remove it from the list of active // plugins. foreach ($check_plugins as $check_plugin) { - if (!file_exists(ABSPATH . 'wp-content/plugins/' . $check_plugin)) { + if (!file_exists(ABSPATH . PLUGINDIR . '/' . $check_plugin)) { $current = get_option('active_plugins'); $key = array_search($check_plugin, $current); if ( false !== $key && NULL !== $key ) { @@ -130,10 +130,10 @@ if (empty($plugins)) { } ?> -<p><?php _e('If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the <code>wp-content/plugins</code> directory and it will be automatically deactivated.'); ?></p> +<p><?php _e(sprintf('If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.', PLUGINDIR)); ?></p> <h2><?php _e('Get More Plugins'); ?></h2> -<p><?php _e('You can find additional plugins for your site in the <a href="http://wordpress.org/extend/plugins/">WordPress plugin directory</a>. To install a plugin you generally just need to upload the plugin file into your <code>wp-content/plugins</code> directory. Once a plugin is uploaded, you may activate it here.'); ?></p> +<p><?php _e(sprintf('You can find additional plugins for your site in the <a href="http://wordpress.org/extend/plugins/">WordPress plugin directory</a>. To install a plugin you generally just need to upload the plugin file into your <code>%s</code> directory. Once a plugin is uploaded, you may activate it here.', PLUGINDIR)); ?></p> </div> |