Changeset 34018

Timestamp:

09/10/2015 09:23:17 PM (10 years ago)

Author:

wonderboymusic

Message:

Move plugin_sandbox_scrape() from wp-admin/plugins.php to wp-admin/includes/plugin.php.

See #33813.

Location:

trunk/src/wp-admin

Files:

• includes/plugin.php (modified) (1 diff)
• plugins.php (modified) (1 diff)

trunk/src/wp-admin/includes/plugin.php

@@ -1949 +1949 @@
     wp_cache_delete( 'plugins', 'plugins' );
 }
+
+/**
+ * @param string $plugin
+ */
+function plugin_sandbox_scrape( $plugin ) {
+    wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
+    include( WP_PLUGIN_DIR . '/' . $plugin );
+}

trunk/src/wp-admin/plugins.php

@@ -149 +149 @@
             @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
             // Go back to "sandbox" scope so we get the same errors as before
-            /**
-             * @param string $plugin
-             */
-            function plugin_sandbox_scrape( $plugin ) {
-                wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
-                include( WP_PLUGIN_DIR . '/' . $plugin );
-            }
             plugin_sandbox_scrape( $plugin );
             /** This action is documented in wp-admin/includes/plugin.php */