From e2c8edc22df22c28e3fb7e7158684326006684e2 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Fri, 16 Aug 2013 15:47:10 +0000 Subject: [PATCH] Be consistent with the arguments passed to the theme_action_links filter. Stop passing stylesheet from class-wp-ms-themes-list-table.php. Props georgestephanis fixes #24478 Built from https://develop.svn.wordpress.org/trunk@25032 git-svn-id: http://core.svn.wordpress.org/trunk@25019 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-ms-themes-list-table.php | 4 ++-- wp-admin/includes/class-wp-themes-list-table.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wp-admin/includes/class-wp-ms-themes-list-table.php b/wp-admin/includes/class-wp-ms-themes-list-table.php index 1d61af9f82..311593d896 100644 --- a/wp-admin/includes/class-wp-ms-themes-list-table.php +++ b/wp-admin/includes/class-wp-ms-themes-list-table.php @@ -284,8 +284,8 @@ class WP_MS_Themes_List_Table extends WP_List_Table { if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) ) $actions['delete'] = '' . __( 'Delete' ) . ''; - $actions = apply_filters( 'theme_action_links', array_filter( $actions ), $stylesheet, $theme, $context ); - $actions = apply_filters( "theme_action_links_$stylesheet", $actions, $stylesheet, $theme, $context ); + $actions = apply_filters( 'theme_action_links', array_filter( $actions ), $theme, $context ); + $actions = apply_filters( "theme_action_links_$stylesheet", $actions, $theme, $context ); $class = ! $allowed ? 'inactive' : 'active'; $checkbox_id = "checkbox_" . md5( $theme->get('Name') ); diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-themes-list-table.php index 684bd8be00..a9a696882d 100644 --- a/wp-admin/includes/class-wp-themes-list-table.php +++ b/wp-admin/includes/class-wp-themes-list-table.php @@ -149,6 +149,7 @@ class WP_Themes_List_Table extends WP_List_Table { . "' );" . '">' . __( 'Delete' ) . ''; $actions = apply_filters( 'theme_action_links', $actions, $theme ); + $actions = apply_filters( "theme_action_links_$stylesheet", $actions, $theme ); $delete_action = isset( $actions['delete'] ) ? '
' . $actions['delete'] . '
' : ''; unset( $actions['delete'] );