Changeset 7999 for trunk/wp-admin/includes/plugin.php

Timestamp:

05/27/2008 05:55:24 PM (18 years ago)

Author:

ryan

Message:

Allow wp-content to exist outside of webroot. Props sambauers. see #6938

File:

• trunk/wp-admin/includes/plugin.php (modified) (4 diffs)

trunk/wp-admin/includes/plugin.php

@@ -40 +40 @@
 
         $wp_plugins = array ();
-        $plugin_root = ABSPATH . PLUGINDIR;
+        $plugin_root = WP_PLUGIN_DIR;
         if( !empty($plugin_folder) )
                 $plugin_root .= $plugin_folder;
@@ -105 +105 @@
                                 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(ABSPATH . PLUGINDIR . '/' . $plugin);
+                        @include(WP_PLUGIN_DIR . '/' . $plugin);
                         $current[] = $plugin;
                         sort($current);
@@ -180 +180 @@
         // plugins.
         foreach ( $check_plugins as $check_plugin ) {
-                if ( !file_exists(ABSPATH . PLUGINDIR . '/' . $check_plugin) ) {
+                if ( !file_exists(WP_PLUGIN_DIR . '/' . $check_plugin) ) {
                         $current = get_option('active_plugins');
                         $key = array_search($check_plugin, $current);
@@ -194 +194 @@
         if ( validate_file($plugin) )
                 return new WP_Error('plugin_invalid', __('Invalid plugin.'));
-        if ( ! file_exists(ABSPATH . PLUGINDIR . '/' . $plugin) )
+        if ( ! file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
                 return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));