Ticket #37041: 37041.diff

src/wp-admin/plugins.php

@@ -39 +39 @@
 
                         check_admin_referer('activate-plugin_' . $plugin);
 
-                        $result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin=' . $plugin), is_network_admin() );
+                        $redirect_to = self_admin_url( 'plugins.php' );
+                        if ( isset( $_REQUEST['redirect_to'] ) ) {
+                                $redirect_to = wp_validate_redirect( wp_unslash( $_REQUEST['redirect_to'] ), $redirect_to );
+                        }
+
+                        $error_redirect = add_query_arg( array( 'error' => 'true', 'plugin' => urlencode( $plugin ) ), $redirect_to );
+                        $result = activate_plugin( $plugin, $error_redirect, is_network_admin() );
+
                         if ( is_wp_error( $result ) ) {
                                 if ( 'unexpected_output' == $result->get_error_code() ) {
-                                        $redirect = self_admin_url('plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin . "&plugin_status=$status&paged=$page&s=$s");
-                                        wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect));
+                                        $redirect_args = array(
+                                                'error'         => 'true',
+                                                'charsout'      => strlen( $result->get_error_data() ),
+                                                'plugin'        => $plugin,
+                                                'plugin_status' => $status,
+                                                'paged'         => $page,
+                                                's'             => $s,
+                                                '_error_nonce'  => wp_create_nonce( 'plugin-activation-error_' . $plugin )
+                                        );
+                                        $redirect = add_query_arg( urlencode_deep( $redirect_args ), $redirect_to );
+                                        wp_redirect( $redirect );
                                         exit;
                                 } else {
                                         wp_die($result);
@@ -60 +76 @@
                                 update_site_option( 'recently_activated', $recent );
                         }
 
-                        if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
-                                wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
-                        } else {
-                                wp_redirect( self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above
+                        $redirect_args = array(
+                                'activate'      => 'true',
+                                'plugin_status' => $status,
+                                'paged'         => $page,
+                                's'             => $s,
+                        );
+                        $redirect = add_query_arg( urlencode_deep( $redirect_args ), $redirect_to );
+
+                        if ( isset( $_GET['from'] ) && 'import' == $_GET['from'] ) {
+                                // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
+                                $redirect = self_admin_url( "import.php?import=" . str_replace( '-importer', '', dirname( $plugin ) ) );
                         }
+
+                        // This overrides the ?error=true redirect above
+                        wp_safe_redirect( $redirect );
                         exit;
 
                 case 'activate-selected':