Changeset 58445

Timestamp:

06/20/2024 03:28:49 PM (4 months ago)

Author:

hellofromTonya

Message:

Plugins: Ensure wp_get_plugin_action_button() returns a string.

[57545] introduced wp_get_plugin_action_button(). This function is documented to return a string. However, if the user does not have the appropriate capabilities, it returned void, which is unexpected.

Resolves the issue by moving the return $button to the bottom of the function to ensure it always returns a string type. On success, the button's HTML string is returned; else, an empty string is returned.

Unit tests are included.

Follow-up to [57545].

Reviewed by jorbin.
Merges [58396] to the 6.5 branch.

Props costdev, rajinsharwar, hellofromTonya.
Fixes #61400.

Location:

branches/6.5

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/plugin-install.php (modified) (2 diffs)
• tests/phpunit/tests/admin/includes (copied) (copied from trunk/tests/phpunit/tests/admin/includes)

branches/6.5/src/wp-admin/includes/plugin-install.php

@@ -918 +918 @@
  * @param bool         $compatible_php   The result of a PHP compatibility check.
  * @param bool         $compatible_wp    The result of a WP compatibility check.
- * @return string $button The markup for the dependency row button.
+ * @return string The markup for the dependency row button. An empty string if the user does not have capabilities.
  */
 function wp_get_plugin_action_button( $name, $data, $compatible_php, $compatible_wp ) {
@@ -1044 +1044 @@
                 break;
         }
-
-        return $button;
-    }
+    }
+
+    return $button;
 }