Changeset 10196

Timestamp:

08/21/2020 05:55:20 AM (6 years ago)

Author:

dd32

Message:

Plugin Directory: Consistently redirect to the referer instead of just back to the plugin page.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes

Files:

• class-plugin-favorites.php (modified) (1 diff)
• class-plugin-self-close.php (modified) (1 diff)
• class-plugin-self-transfer.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-favorites.php

@@ -62 +62 @@
      */
     public function favorite( $request ) {
-        $location = get_permalink( Plugin_Directory::get_plugin_post( $request['plugin_slug'] ) );
-        header( "Location: $location" );
-
-        $result = array(
-            'location' => $location,
-        );
+        $plugin = Plugin_Directory::get_plugin_post( $request['plugin_slug'] );
+        $result = [
+            'location' => wp_get_referer() ?: get_permalink( $plugin ),
+        ];
+        header( 'Location: ' . $result['location'] );
 
         if ( ! isset( $request['favorite'] ) && ! isset( $request['unfavorite'] ) ) {

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-self-close.php

@@ -57 +57 @@
      */
     public function self_close( $request ) {
-        $plugin   = Plugin_Directory::get_plugin_post( $request['plugin_slug'] );
-        $location = get_permalink( $plugin );
-        header( "Location: $location" );
-
+        $plugin = Plugin_Directory::get_plugin_post( $request['plugin_slug'] );
         $result = [
-            'location' => $location,
+            'location' => wp_get_referer() ?: get_permalink( $plugin ),
         ];
+        header( 'Location: ' . $result['location'] );
 
         // Close the plugin.

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-plugin-self-transfer.php

@@ -66 +66 @@
      */
     public function self_transfer( $request ) {
-        $plugin   = Plugin_Directory::get_plugin_post( $request['plugin_slug'] );
-        $location = get_permalink( $plugin ) . 'advanced/';
-        header( "Location: $location" );
+        $plugin = Plugin_Directory::get_plugin_post( $request['plugin_slug'] );
         $result = [
-            'location'    => $location,
+            'location'    => wp_get_referer() ?: get_permalink( $plugin ),
             'transferred' => false,
         ];
+        header( 'Location: ' . $result['location'] );
 
         // New owner must also have commit rights.