IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Detect and handle symlinking of plugins in plugin_basename().

Browse Source 
props rmccue, MikeSchinkel, jdgrimes.
see #16953.

Built from https://develop.svn.wordpress.org/trunk@27158


git-svn-id: http://core.svn.wordpress.org/trunk@27024 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin
2014-02-10 23:00:15 +00:00
parent c8665c5973
commit 5f0981788d
6 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/includes/plugin.php
View File

@@ -537,7 +537,8 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen
if ( !empty($redirect) )
wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
ob_start();
include_once(WP_PLUGIN_DIR . '/' . $plugin);
wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
include_once( WP_PLUGIN_DIR . '/' . $plugin );
if ( ! $silent ) {
/**
@@ -921,6 +922,7 @@ function uninstall_plugin($plugin) {
unset($uninstallable_plugins);
define('WP_UNINSTALL_PLUGIN', $file);
wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . dirname( $file ) );
include WP_PLUGIN_DIR . '/' . dirname($file) . '/uninstall.php';
return true;
@@ -932,6 +934,7 @@ function uninstall_plugin($plugin) {
update_option('uninstall_plugins', $uninstallable_plugins);
unset($uninstallable_plugins);
wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
include WP_PLUGIN_DIR . '/' . $file;
add_action( 'uninstall_' . $file, $callable );