Skip to content

Fix plugin search, broke with escaping #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
costdev merged 8 commits into from
Oct 31, 2025
+32 −18
Merged

Fix plugin search, broke with escaping #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1ae669d
Improve escaping for plugin search elements
afragen Oct 30, 2025
6ce9a6b
replacement is escaped so just ignore otherwise
afragen Oct 30, 2025
252e053
switch to regex as otherwise need translations everywhere
afragen Oct 30, 2025
afde6f8
no mods if pre WP6.9
afragen Oct 30, 2025
9ac60d4
better compare for post-WP6.9
afragen Oct 30, 2025
7a3a3b1
use is_wp_version_compatible
afragen Oct 31, 2025
1b26658
early escape no output buffering
afragen Oct 31, 2025
fd1c9cd
comments
afragen Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions inc/packages/admin/class-list-table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,33 @@ class List_Table extends WP_Plugin_Install_List_Table {
/**
* Replace Add Plugins message with ours.
*
* Skip for WP versions prior to 6.9.0.
*
* @since WordPress 6.9.0
* @return void
*/
public function views() {
if ( ! is_wp_version_compatible( '6.9' ) ) {
parent::views();
return;
}

ob_start();
parent::views();
$views = ob_get_clean();

echo wp_kses_post(
str_replace(
// phpcs:ignore WordPress.WP.I18n.MissingArgDomain -- Intentional use of Core's text domain.
[ __( 'https://wordpress.org/plugins/' ), __( 'WordPress Plugin Directory' ) ],
[ esc_url( 'https://fair.pm/packages/plugins/' ), __( 'FAIR Package Directory', 'fair' ) ],
$views
)
);
preg_match( '|<a href="(?<url>[^"]+)">(?<text>[^>]+)<\/a>|', $views, $matches );
if ( ! empty( $matches['text'] ) ) {
$text_with_fair = str_replace( 'WordPress', 'FAIR', $matches['text'] );
$str = str_replace(
[ $matches['url'], $matches['text'] ],
[ __( 'https://fair.pm/packages/plugins/', 'fair' ), $text_with_fair ],
$matches[0]
);
}

// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Replacements are escaped. The previous content is direct from Core.
echo str_replace( $matches[0], $str, $views );
}

/**
Expand Down
23 changes: 13 additions & 10 deletions inc/packages/admin/namespace.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ function bootstrap() {
add_filter( 'wp_list_table_class_name', __NAMESPACE__ . '\\maybe_override_list_table' );

// Needed for pre WordPress 6.9 compatibility.
global $wp_version;
if ( version_compare( $wp_version, '6.9-beta1', '<' ) ) {
if ( ! is_wp_version_compatible( '6.9' ) ) {
add_action( 'install_plugins_featured', __NAMESPACE__ . '\\replace_featured_message' );
add_action( 'admin_init', fn() => remove_action( 'install_plugins_featured', 'install_dashboard' ) );
}
Expand Down Expand Up @@ -87,14 +86,18 @@ function replace_featured_message() {
\display_plugins_table();
$views = ob_get_clean();

echo wp_kses_post(
str_replace(
// phpcs:ignore WordPress.WP.I18n.MissingArgDomain -- Intentional use of Core's text domain.
[ __( 'https://wordpress.org/plugins/' ), __( 'WordPress Plugin Directory' ) ],
[ esc_url( 'https://fair.pm/packages/plugins/' ), __( 'FAIR Package Directory', 'fair' ) ],
$views
)
);
preg_match( '|<a href="(?<url>[^"]+)">(?<text>[^>]+)<\/a>|', $views, $matches );
if ( ! empty( $matches['text'] ) ) {
$text_with_fair = str_replace( 'WordPress', 'FAIR', $matches['text'] );
$str = str_replace(
[ $matches['url'], $matches['text'] ],
[ __( 'https://fair.pm/packages/plugins/', 'fair' ), $text_with_fair ],
$matches[0]
);
}

// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Replacements are escaped. The previous content is direct from Core.
echo str_replace( $matches[0], $str, $views );
}

/**
Expand Down