vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-04 17:20:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Detect and handle symlinking of plugins in plugin_basename().

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


git-svn-id: https://develop.svn.wordpress.org/trunk@27158 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2014-02-10 22:59:40 +00:00
parent ef099f8082
commit b7be4e98fe
6 changed files with 62 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/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 );

1
src/wp-admin/plugins.php
View File

@@ -143,6 +143,7 @@ if ( $action ) {
@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
// Go back to "sandbox" scope so we get the same errors as before
function plugin_sandbox_scrape( $plugin ) {
wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
include( WP_PLUGIN_DIR . '/' . $plugin );
}
plugin_sandbox_scrape( $plugin );

3
src/wp-admin/update.php
View File

@@ -84,7 +84,8 @@ if ( isset($_GET['action']) ) {
error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
include(WP_PLUGIN_DIR . '/' . $plugin);
wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
include( WP_PLUGIN_DIR . '/' . $plugin );
}
iframe_footer();
} elseif ( 'install-plugin' == $action ) {